Romuald Conty
58dcf63e7c
MERGE: libnfc-mingw-cross merge with trunk (r805-821)
2010-11-17 08:29:41 +00:00
Romuald Conty
6df612a364
Errors use #define instead of constant values.
...
Update Issue 84
Current 'ident' command breaks commit-concerned lines.
2010-11-15 18:50:53 +00:00
Romain Tartiere
4e5d0766e1
Rename append_iso14443a_crc() to iso14443a_crc_append().
2010-10-29 10:59:26 +00:00
Philippe Teuwen
26de9d3a69
nfc-anticol: Computes CRC rather than hardcoded one. psst: r800 \o/
2010-10-26 15:01:46 +00:00
Romuald Conty
a214974684
Remove INFO macro: display was not clear enough and does not provide a big benefit.
...
New Issue
Summary: Remove nfc-message.h file from installed ones
nfc-message.h provide some usefull debugging macros but I am not sure that these macros have to be installed with other files.
2010-10-26 14:27:17 +00:00
Philippe Teuwen
1963bb65e4
nfc-anticol: Cascade based on SAK rather than CT, better for educational purpose
2010-10-25 13:48:01 +00:00
Philippe Teuwen
56e37ec309
nfc-anticol: Adds support for CL3 (Fixes issue 126) Thanks.
2010-10-25 13:00:39 +00:00
Philippe Teuwen
5a6bb0bbc5
examples: mifare.c fix potential bug when used in non-EasyFraming environment
2010-10-20 18:11:06 +00:00
Philippe Teuwen
0abdf67b8b
nfc-anticol: fix bug in long UID display, and some more details
2010-10-20 15:23:09 +00:00
Romuald Conty
311471024a
Fix printing of 847 kbps baud rate and a minor compil warning
2010-10-20 09:27:34 +00:00
Philippe Teuwen
aba4cec7d6
nfc-utils: more ATQA/SAK fingerprinting
2010-10-19 21:36:43 +00:00
Philippe Teuwen
838db98400
Examples: more ISO14443A ATQA+SAK possible matches
2010-10-19 13:08:56 +00:00
Philippe Teuwen
2b24a0a7f5
Examples: more ISO14443A info decoding & verbose mode for nfc-list
2010-10-19 12:50:52 +00:00
Romuald Conty
f249af6266
Add ISO14443-4 modulation to hardware polling only when NDO_AUTO_ISO14443_4A have been enabled and document this features and known issues.
2010-10-19 09:34:18 +00:00
Romuald Conty
57560c3290
Document the ACR122 problem.
...
Update Issue 117
Status: WontFix
ACR122 device support is limited. We can not provide a rock-solid support of emulation on these devices this way (talking directly to PN532).
2010-10-18 15:17:31 +00:00
Romuald Conty
65da34398d
nfc-list: clean up configuration, that now handled by nfc_initiator_list_passive_targets()
2010-10-18 10:12:24 +00:00
Philippe Teuwen
43f2004b11
nfc-relay-picc: remove unused #define
2010-10-16 09:57:39 +00:00
Romuald Conty
1f62e9e2f2
Improve API for target emulation, nfc_target_mode_t does not exist anymore (this mode is computed from nfc_target_t)
2010-10-15 14:32:10 +00:00
Roel Verdult
1e52e1dc9f
fixed printf warning
2010-10-15 13:27:18 +00:00
Philippe Teuwen
655460059a
nfc-utils: more decoding of ISO14443-4 Tk bytes
2010-10-15 08:57:58 +00:00
Philippe Teuwen
91f73e1802
nfc-utils: More decoding of ISO14443-4 ATS
2010-10-15 08:33:46 +00:00
Philippe Teuwen
33a99288f3
pn53x target_init: fix bug to use Tk; nfc-relay-picc: fix potential segfault
2010-10-14 20:17:58 +00:00
Philippe Teuwen
894d6b8d3b
Oops typo
2010-10-14 18:37:10 +00:00
Philippe Teuwen
ffe50562dd
Make use of the now available Tk info
2010-10-14 18:33:17 +00:00
Romuald Conty
8142e69121
Fix a misunderstood Historical Bytes decoding
2010-10-14 16:28:16 +00:00
Romuald Conty
7c76e1bf32
nfc_target_init() now update nfc_target_t baud rate
2010-10-14 16:27:50 +00:00
Romuald Conty
7294e4fbaf
examples/nfc-utils: decode more ATS info
2010-10-14 14:48:59 +00:00
Romuald Conty
507a23b708
Improve nfc_target_init()
2010-10-14 13:31:36 +00:00
Romuald Conty
60c9da598a
Support different baud rates for nfc_initiator_select_dep_target()
2010-10-14 13:03:23 +00:00
Romuald Conty
2f267f5463
nfc-relay-picc: Add new example to relay ISO14443-4 communications, with this one it can communicate over network... Enjoy! (Thanks to generous contributor)
2010-10-14 12:27:51 +00:00
Philippe Teuwen
5a5b5d681b
Small typos
2010-10-14 11:53:27 +00:00
Romuald Conty
af88da1a9c
Replace nfc_target_info_t with nfc_target_t in API function, we now have a coherent struct to handle nfc_target_t, use it!
2010-10-14 11:44:43 +00:00
Romuald Conty
6f3fbcb6bf
Fix nfc_dep_mode_t usage in API, fix/improve documentation
2010-10-14 11:12:23 +00:00
Romuald Conty
3c4972b9a3
Add TODO
2010-10-13 22:26:17 +00:00
Romuald Conty
9d9b5a629e
Fix nfc-poll, improve pn53x_target_type_t decoding
2010-10-13 21:40:54 +00:00
Romuald Conty
adba90684d
introduce nfc_dep_mode_t type instead of bool in nfc_initiator_select_dep_target()
2010-10-13 19:59:39 +00:00
Romuald Conty
f2a3d51037
Fix a bug introduce in r729, fix a compilation warning
2010-10-13 19:50:43 +00:00
Romuald Conty
979430ecd1
nfc_target_t have now nfc_modulation_t instead of nfc_modulatation_type_t
2010-10-13 19:17:51 +00:00
Romuald Conty
d289eabc36
Attempt to provide clean types for API
2010-10-13 17:43:23 +00:00
Romuald Conty
9020014160
Rename nfc_modulation_t as pn53x_modulation_t
2010-10-13 15:39:52 +00:00
Romuald Conty
695e5c2f37
Rename nfc_target_type_t as pn53x_target_type_t
2010-10-13 15:31:48 +00:00
Romuald Conty
c53c512831
Change some nfc_target_type_t to insist on the ISO/IEC 14443-4 compliance
2010-10-13 11:49:34 +00:00
Romuald Conty
0fe30e3db7
Change some nfc_target_mode_t to insist on the restrictions offer these mode
2010-10-13 11:35:28 +00:00
Philippe Teuwen
9d1e72a9f7
pn53x_usb: leave the device in cleaner state (Fixes Issue 123)
2010-10-12 15:51:57 +00:00
Romuald Conty
c34be50ef1
For the sake of consistency, rename all szRxLen to szRx and szTxLen to szTx
2010-10-12 14:56:42 +00:00
Romuald Conty
5d753827c1
Add a nfc-utils fonction (not in API) to display nfc_target_type_t as string
2010-10-12 14:05:28 +00:00
Romuald Conty
202c2a7a8b
nfc-emulate-uid: fix wrong UID length in initial nfc_target_t
2010-10-12 14:04:30 +00:00
Romuald Conty
d7bffac0e6
Fix const bytes notation, string notation will add EOL ('\0')
2010-10-12 14:02:53 +00:00
Romuald Conty
b333a4b1cf
Add FeliCa to emulation capabilities
2010-10-12 09:44:39 +00:00
Romuald Conty
602787bd03
We can now use an nfc_dep_info_t to specify DEP info as initiator.
2010-10-11 14:49:08 +00:00
Philippe Teuwen
ddb8fe9b1f
nfc-relay: fix UID len & doc
2010-10-11 11:35:46 +00:00
Romuald Conty
08b06c1d03
Emulated DEP targets can now be customized (NFCID3 and General Bytes).
2010-10-08 21:54:59 +00:00
Philippe Teuwen
b72ce3decd
Add pn53x-tamashell manpage
2010-10-08 21:31:12 +00:00
Romuald Conty
b8395d9506
Rename nfcip-* examples to nfc-dep-*
2010-10-08 20:36:13 +00:00
Romuald Conty
1e9c390dfa
Improve DEP info struct: add more info, and InJumpDEP now fill fully this struct.
2010-10-08 20:25:34 +00:00
Philippe Teuwen
1d0c7fe68e
Examples: some more misc fixes
2010-10-08 20:01:47 +00:00
Philippe Teuwen
7128eabfad
Examples: misc fixed & enhancements in the doc
2010-10-08 19:24:54 +00:00
Romuald Conty
74a8ebde41
nfcip-*: Add man pages.
2010-10-08 18:28:23 +00:00
Romuald Conty
13d0bb7b0f
nfcip-*: code clean up, enhance output to understand what happens.
2010-10-08 18:15:00 +00:00
Romuald Conty
bf1f9c68d3
nfc-list: remove some useless calls to nfc_configure(), these settings are applied by default.
2010-10-08 18:13:18 +00:00
Romuald Conty
aeadaf536c
nfc-poll: code clean up, add man page.
2010-10-08 17:05:05 +00:00
Romuald Conty
8ec4c57910
pn53x-diagnose: add man page.
2010-10-08 16:57:09 +00:00
Romuald Conty
9b3dbc272c
Update existing man pages.
2010-10-08 16:24:04 +00:00
Romuald Conty
994b119c32
nfc-emulate-forum-tag4 (renamed from nfc-emulate-ndef): add a man page.
2010-10-08 15:37:21 +00:00
Romuald Conty
fd211d53f8
nfc-emulate-tag: improve documentation, add a man page.
2010-10-08 14:45:48 +00:00
Romuald Conty
993a16f17c
nfc-emulate-uid: finalize renaming.
2010-10-08 14:10:28 +00:00
Romuald Conty
79ebce2549
examples: rename nfc-emulate to nfc-emulate-uid.
...
Add some code documentation.
Update man page.
2010-10-08 14:05:10 +00:00
Romuald Conty
1565d540a8
Remove useless FIXME
2010-10-07 13:00:57 +00:00
Romuald Conty
840ff89450
Fix minor warnings
2010-10-07 12:59:12 +00:00
Philippe Teuwen
cb346cf20b
nfc-emulate-ndef: some more doc
2010-10-06 21:04:52 +00:00
Philippe Teuwen
b74267901d
nfc-emulate-tag: some more doc & Mifare example (not complete)
2010-10-06 20:31:36 +00:00
Romuald Conty
623c8bbeef
Remove useless FIXME
2010-10-06 10:11:24 +00:00
Romuald Conty
5fdb7ab254
examples: rename nfc-sam to pn53x-sam, it need to made some direct calls to pn53x_* functions.
2010-10-06 09:10:14 +00:00
Romuald Conty
ec3f854a68
nfc-sam: code clean up and fix comments
2010-10-06 09:03:08 +00:00
Philippe Teuwen
d75e25d29d
nfc-emulate-ndef now using easy framing & fix timing issues
2010-10-05 10:05:22 +00:00
Philippe Teuwen
2024e5f904
nfc-list: add example how to address directly a USB device by its name
2010-10-05 07:53:19 +00:00
Philippe Teuwen
6eca8843f6
nfc-emulate-ndef: document exchange & remove compil warning
2010-10-04 21:01:11 +00:00
Romuald Conty
98d0f2522f
nfc-emulate-tag: add DESELECT command, enhance debug
2010-10-04 19:17:40 +00:00
Romuald Conty
e800765ffc
nfc-emulate-ndef: remove one pn53x_set_parameters(). Note: it works a lot better with ARYGON (serial @9600 bauds) than touchatag through PCSC and USB.
2010-10-04 18:12:57 +00:00
Romuald Conty
ad7a8a59a6
nfc-emulate: Use a better const byte_t notation (no \0 EOL character).
2010-10-04 18:00:17 +00:00
Romuald Conty
178f73d98a
nfc-sam: NTM_PICC does exist anymore and I dont think thats needed to all but ISO14443-4 initiator in this place.
2010-10-04 13:30:12 +00:00
Romuald Conty
da1de80aa6
nfc-emulate-ndef: use nfc_target_receive_bytes() instead of pn53x_target_receive_bytes(), adjust NTM_PICC new name
2010-10-04 13:28:36 +00:00
Romuald Conty
5233fceda7
Improve the target emulation functions (ATM, only ISO14443A), add an example (nfc-emulate-tag), update examples to use the new API.
2010-10-04 12:46:03 +00:00
Romuald Conty
d2d15afa3b
examples: minor enhancements
2010-10-04 12:43:22 +00:00
Romuald Conty
afb1c3a0f8
examples: minor enhancements
2010-10-04 12:37:43 +00:00
Philippe Teuwen
80ee446f74
pn53x-tamashell now accepts scripts, see examples
2010-10-04 12:36:29 +00:00
Romuald Conty
17b940c610
Finalize pn53x-tamashell integration (add readline m4, fiw minor warnings, adjust Makefile.am)
2010-10-04 10:24:45 +00:00
Philippe Teuwen
87161b5b7b
Examples: pn53x-tamashell
...
TODO: readline detection via autoconf
2010-10-02 23:35:24 +00:00
Philippe Teuwen
eca47b3cff
nfc-emulate-ndef: S(DESELECT) is actually auto in this mode
2010-10-01 17:59:23 +00:00
Romuald Conty
ae522c843c
nfc-sam: fix author fields (name and email).
2010-10-01 16:30:38 +00:00
Romuald Conty
f31cb6193b
Minor man pages update.
2010-10-01 14:27:39 +00:00
Romuald Conty
bf995b3c4e
nfc-emulate-ndef: change Tx/Rx message to prevent from mixing with TX/RX from debug mode, add the first receive datas.
2010-09-30 16:02:02 +00:00
Romuald Conty
3c5e815ddd
nfc-emulate-ndef: remove minor compilation warnings, add a FIXME to remove pn53x specific code in this example.
...
New issue
Summary: Remove pn53x specific from nfc* examples
Labels: Priority-Low Milestone-1.4.x
Examples provided by libnfc should show the "right" way to use libnfc and to use pn53x specific (and non public) functions is not a good pratice.
There can be some exceptions only if its really dedicated to one kind of chip and the example name have to follow the format "chip-function" instead of usual "nfc-function". (e.g. pn53x-diagnose)
2010-09-30 08:36:49 +00:00
Romuald Conty
3cd0860203
nfc-emulate-ndef: minor clean up, improve error debugging.
2010-09-29 15:26:17 +00:00
Romuald Conty
a9b8b84e13
Build nfc-emulate-ndef example
2010-09-29 11:08:06 +00:00
Romuald Conty
2318182c2c
Remove minor warning.
2010-09-29 09:59:02 +00:00
Roel Verdult
e0c01fca01
commented nfcip lines
2010-09-28 16:18:05 +00:00
Roel Verdult
6dfe88113e
Added new example, PN53x chips will now emulate NDEF tag! not in build-script yet
2010-09-28 16:15:59 +00:00
Romuald Conty
5efa9e2cdb
Jewel/Topaz full UID is 6 bytes long (7 bytes with the manufacturer ID) but during select only the 4 LSB are returned, so we change the display to keep it in mind. (Thanks to Phil)
2010-09-28 15:37:36 +00:00
Romuald Conty
8672c809bd
example: Jewel support in nfc-list and nfc-poll. (Many thanks to Phil)
2010-09-28 15:31:31 +00:00
Romuald Conty
cab6d19c5a
examples: decode more data from ATQB. (Thanks to Phil)
2010-09-28 15:27:06 +00:00
Romuald Conty
15f3609eaf
nfcip-target: add an hack to allow to use two devices on the same machine. (Thanks to Phil)
2010-09-28 15:24:05 +00:00
Roel Verdult
16fd4bc2a0
Typo ;)
2010-09-24 16:51:30 +00:00
Roel Verdult
6f89ad50f8
add key for democards
2010-09-24 16:29:17 +00:00
Romuald Conty
1acf950ce9
Improve ISO14443B display: some protocol information are now decoded to be displayed.
2010-09-23 17:03:19 +00:00
Romuald Conty
2f95fb254b
Improve ATQB decoding: "PUPI", "Application Data", and "Protocol Info" is now available as separated fields.
2010-09-23 16:26:06 +00:00
Romuald Conty
ccfd24a682
nfc-anticol now works even after running another program that change the modulation (Fixes Issue 111) (Thanks to Phil for help).
2010-09-23 16:03:05 +00:00
Romuald Conty
7e2ddedfc1
Fix ISO14443-B ATTRIB_RES decoding. (Thanks to Phil)
2010-09-23 10:12:10 +00:00
Romuald Conty
c6f074ba96
nfc-poll: fix a potential segfault (Thanks to Phil)
2010-09-23 09:40:23 +00:00
Romuald Conty
e2a2557396
Replace wrong decoded ISO14443-B data by ATTRIB_RES field.
...
New issue
Summary: Improve ISO 14443-B data (ATTRIB_RES) decoding
Before this revision, pn53x_decode_target_data() wrongly decode ISO14443-B. Currently, whole ATTRIB_RES field is stored in nfc_target_info_t struct.
I do not find the correct documentation to fix it better than this, but at least it now retrieves a correct value.
2010-09-22 19:10:50 +00:00
Romuald Conty
bd547418e9
nfc-poll: disconnect from device if error in order to prevent from keep up RF field which have side effects: its power-consumming, device can became warm and it generates useless radiofrequencies.
2010-09-22 12:48:40 +00:00
Romuald Conty
0e40b6f7dd
nfc-poll: now poll more than ISO14443-A
2010-09-22 12:36:20 +00:00
Romuald Conty
dfcb6f6cd3
Minor code cleanup in nfc-anticol
2010-09-20 15:55:55 +00:00
Romuald Conty
7be31d0ba8
Update documentation and associated example.
2010-09-08 09:16:24 +00:00
Romuald Conty
18cc86a613
Indent whole code using make indent. (Fixes issue 84).
2010-09-07 17:51:03 +00:00
Romain Tartiere
81a1eb2c6c
Don't display authentication errors in examples.
2010-09-07 13:34:48 +00:00
Romuald Conty
18d31cd672
Reintroduce oddparity() function used by project based on libnfc but in nfc-utils.[ch] to prevent from exporting them in API.
2010-09-06 10:02:19 +00:00
Romuald Conty
43ca2c827b
Remove unused file.
2010-09-06 09:27:06 +00:00
Romain Tartiere
2efbccf236
Explicitly enable auto ISO14443-4 mode for nfc-list.
2010-09-04 10:20:02 +00:00
Romain Tartiere
cbbe559f94
Alse remove nfc_target_receive_dep_bytes() and nfc_target_send_dep_bytes().
...
Update issue 106
Implement what's described in comment 3, 7 and 8.
2010-09-03 16:45:24 +00:00
Romain Tartiere
a5676ecd94
Remove nfc_initiator_transceive_dep_bytes() and introduce NDO_EASY_FRAMING option.
...
Always use nfc_initiator_transceive_bytes(). If you where using advanced
features and already relying on nfc_initiator_transceive_bytes(), then your
code has to be updated to unset the NDO_EASY_FRAMING option. See an example of
such a change in the libfreefare's repository:
http://code.google.com/p/nfc-tools/source/detail?r=566
Updates issue 106
Status: Feedback
Romuald: I am not sure about the option enum values. I took 0x02 thinking it
would not hurt but am not really sure about that because I can see many 'holes'
in the sequence.
2010-09-03 16:13:36 +00:00
Romain Tartiere
fbcf966d20
Merge r566-569 from the libnfc-error-handling branch.
...
Fix issue 103
2010-08-24 09:32:42 +00:00
Romain Tartiere
00ad302e32
Fix CMake build.
2010-08-24 09:29:59 +00:00
Romain Tartiere
32917a9c0a
Unbreak nfc-list on windows.
...
The 'z' format modifier is not portable. Switch to a basic int and cast the
size_t to an int.
2010-08-24 09:23:48 +00:00
Romain Tartiere
5b0589c381
Merge r551-563 from trunk.
2010-08-20 10:41:30 +00:00
Romain Tartiere
1e329529a7
Update nfc-poll example to enhance unsupported features detection.
2010-08-20 10:16:52 +00:00
Romuald Conty
040db45ae4
nfc-mfclassic: disable ISO14443-4 auto-switching in order to read devices that emulate Mifare Classic with ISO14443-4 compliance.(e.g. Nokia 6212 Classic)
2010-08-19 10:59:45 +00:00
Romain Tartiere
eb90b92c12
Detect errors in examples.
2010-08-18 17:22:13 +00:00
Romain Tartiere
27b97c0fda
Fix build on Microsoft Windows.
2010-08-18 16:55:16 +00:00
Romain Tartiere
0a09c8d8e7
Flag some problems in the examples.
2010-08-18 14:44:40 +00:00
Romain Tartiere
769eef20f7
Merge r520-546 from trunk.
2010-08-18 14:32:01 +00:00
Romuald Conty
6354e94657
mifare function improvement: it now failed when read command does not return a whole block (16 bytes).
2010-08-18 13:53:34 +00:00
Romuald Conty
4b123ab583
nfc-mfclassic now fails ealier when something goes wrong (this allow to prevent from false-success).
2010-08-18 13:20:40 +00:00
Romuald Conty
cf9af4ee49
nfc-list example now use nfc_initiator_list_passive_targets() function.
2010-08-18 13:13:14 +00:00
Romuald Conty
3dd2257b57
Add print_nfc_felica_info() and print_nfc_iso14443b_info() functions to nfc-utils (used by examples)
2010-08-18 12:50:40 +00:00
Romuald Conty
eeaad85151
Add SAK decoding for compliance with ISO/IEC.
2010-08-17 15:24:37 +00:00
Romuald Conty
41b1455f04
Clean up wrong comments in nfc-poll.
2010-08-16 16:27:50 +00:00
Romain Tartiere
655fdb569a
Fix nfc_initiator_mifare_cmd() in examples.
...
In r509, a direct call to pn53x_transceive() was changed into a call to nfc_initiator_transceive_dep_bytes() which is part of the public API. The command to send was updated accordingly, but the code that extracts the response have not.
Update issue 98
This should fix the problem: because the response was not the expected length, the actual card data was not copied to the buffer, so it was always the same 16 uninitialized bytes that where returned for any block.
PR: Issue 98
Submitted by: zamby.ing
Pointy hat to: me
2010-08-13 19:53:13 +00:00
Romain Tartiere
b289784359
Merge r511-519 from trunk.
2010-08-11 16:59:09 +00:00
Romain Tartiere
f237d44339
Take care of 16-blocks-long sectors of Mifare Classic 4K in the nfc-mfclassic example's blocks counting routine.
2010-08-11 09:26:22 +00:00
Romain Tartiere
4a5347e5ae
Merge r512 from trunk.
2010-08-10 21:41:42 +00:00
Romain Tartiere
3ec0b9376c
Make Mifare example use only the libnfc public API.
2010-08-10 21:36:57 +00:00
Romain Tartiere
dfb82f8893
Merge r499-510 from trunk.
2010-08-10 21:14:13 +00:00
Romain Tartiere
eece496351
Use nfc_initiator_transceive_dep_bytes() instead of pn53x_transceive() in example.
2010-08-10 21:00:08 +00:00
Romain Tartiere
fd0efd4a62
Fix build on Microsoft Windows.
...
Windows users: I hate you in secret.
2010-08-10 19:50:29 +00:00
Romain Tartiere
d0357cf3aa
Merge r486-498 from trunk.
2010-07-31 14:23:33 +00:00
Romain Tartiere
79aeaa6287
Factorise code.
...
Avoid redundant code in PN53x usb and uart drivers. Since it makes sense to
report errors at the nfc_device_t level, pass it directly to
pn53x_transceive().
Programs using the libnfc MAY use pn53x_transceive() to communicate with a NFC
device, and SHALL not use anymore pnd->pdc->transceive(). Code in the library
itself SHOULD avoid calling pnd->pdc->transceive(), so such construct have been
updated accordingly.
2010-07-31 14:20:15 +00:00
Romain Tartiere
301d692e8a
Flag references to deprecated usage of pn53x_transceive().
...
New issue
Summary: pn53x_transceive() workaround reverences in examples/nfc-poll.c comments
Status: New
Owner: rconty@il4p.fr
Cc: rtartiere@il4p.fr
The source code of nfc-poll has references to no using pn53x_transceive() for
the status-byte workaround reason in a comment. However this function is not
called in the code. While I guess that's some comment that should have been
removed and have never reached the svn repo, I prefer to be sure that it can be
removed. The comments where introduced at the same time of the file, at r353.
2010-07-31 14:02:46 +00:00
Romain Tartiere
bb06d45a05
Really silent down gcc with -Wextra.
2010-07-31 12:57:02 +00:00
Romain Tartiere
36ee32f81a
Merge r478-485 from trunk.
2010-07-30 16:34:12 +00:00