Commit Graph

439 Commits

Author SHA1 Message Date
gdisirio 700b05269e Posix demo updated and re-tested.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2626 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-01-09 10:31:53 +00:00
gdisirio ff333430f1 Serial driver changes, bug 3153550 fixed.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2625 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-01-09 10:10:39 +00:00
gdisirio ab5dc4cae1 Fixed bug 3153437.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2623 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-01-08 20:10:20 +00:00
gdisirio f1c970760f IAR demo for LPC11xx, untested because code size limits.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2616 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-01-08 12:14:16 +00:00
gdisirio eb665ad240 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2615 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-01-08 12:09:18 +00:00
gdisirio cba62c4bc9 Fixed bug 3152510.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2600 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-01-06 16:34:20 +00:00
gdisirio 3a21dac552 Fixed bug 3152482.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2599 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-01-06 16:14:40 +00:00
gdisirio 0116b4d06b git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2596 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-01-06 12:18:51 +00:00
gdisirio 7799821b6e git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2594 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-01-06 10:33:57 +00:00
gdisirio 24cb881726 Documentation related fixes.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2580 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-01-04 15:08:29 +00:00
gdisirio 31881e1dd3 Updated the various serial drivers with the new queue callbacks.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2573 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-01-02 14:58:51 +00:00
gdisirio f251925785 Fixed typo.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2559 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-12-31 11:41:14 +00:00
gdisirio ad9cdbe42b Small documentation error.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2558 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-12-31 11:04:06 +00:00
gdisirio 1604490dc9 Wrong ifdef.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2532 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-12-25 11:41:36 +00:00
gdisirio 99cee8a6ed Added USB clock configuration to the STM32 HAL driver.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2531 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-12-25 11:30:44 +00:00
gdisirio ea76e46321 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2527 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-12-24 20:49:28 +00:00
gdisirio 0f395838d3 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2516 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-12-21 18:25:56 +00:00
gdisirio e3a932e0e6 Win32 simulator updated.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2505 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-12-19 11:20:30 +00:00
gdisirio 7d7d9727f9 STM32 board files and demos now use the new organization.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2497 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-12-19 09:13:54 +00:00
gdisirio 7aa43aee70 Documentation improvements.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2490 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-12-18 08:31:56 +00:00
gdisirio 24eecd9a1b Fixed bug 3138763.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2486 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-12-16 21:09:29 +00:00
gdisirio 1b12d62bd7 White space fixes.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2476 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-12-12 14:51:21 +00:00
gdisirio 7d66301e92 More STM32 ADC improvements.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2472 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-12-11 17:35:55 +00:00
gdisirio 7adef2884e Removed CMSIS dependencies from the ARMCMx port layer.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2471 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-12-11 16:01:07 +00:00
gdisirio 27b7c4ec04 Implemented CR on the STM32 ADC driver.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2467 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-12-11 08:54:40 +00:00
gdisirio 6f0b15aba3 Implemented CR on STM32 CAN driver.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2466 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-12-11 08:37:28 +00:00
gdisirio 57fd0a2273 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2461 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-12-05 12:20:46 +00:00
gdisirio d8edc8d012 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2460 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-12-05 12:18:15 +00:00
gdisirio f650ce36c1 Better mcuconf.h file for LPC11xx.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2459 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-12-05 11:47:18 +00:00
gdisirio 56ce4d958c Fixed bug 3127926.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2458 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-12-05 11:38:27 +00:00
gdisirio 064bb29a4c Fixed bug 3127921.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2457 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-12-05 11:29:17 +00:00
gdisirio 26b93576d9 Documentation related fix.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2456 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-12-05 09:42:49 +00:00
gdisirio 6f991ed990 Documentation related fixes.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2455 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-12-04 12:12:55 +00:00
gdisirio 718f2d0cd1 Fixed bug 3121246.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2447 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-11-28 12:21:49 +00:00
gdisirio 7290349063 Documentation related fixes.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2443 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-11-28 09:17:53 +00:00
gdisirio d040dd79a6 fixed spacing
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2441 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-11-28 09:04:58 +00:00
gdisirio 9b7b5ce6bf Fixed bug 3120785.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2439 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-11-27 19:16:40 +00:00
gdisirio 06593fd396 STM32 SPI driver optimization.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2427 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-11-25 20:45:15 +00:00
gdisirio c852dcb3c9 Improved ADC and SPI driver models.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2426 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-11-25 18:32:45 +00:00
gdisirio a5bdf86e5b git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2424 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-11-23 16:16:53 +00:00
gdisirio df85f0e666 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2418 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-11-22 17:34:04 +00:00
gdisirio 2c644359b5 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2417 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-11-22 17:17:51 +00:00
gdisirio 955425572d Had to go back...
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2416 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-11-21 21:31:35 +00:00
gdisirio a15011815c git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2414 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-11-21 19:08:43 +00:00
gdisirio 1de70ad9c8 Fixed bug 3114696.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2412 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-11-21 18:41:12 +00:00
gdisirio feba444df5 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2411 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-11-21 15:46:17 +00:00
gdisirio 32e43fdb02 Fixed bug 3114481.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2409 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-11-21 13:45:22 +00:00
gdisirio 2847f7574d Fixed bug 3114467.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2408 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-11-21 13:09:42 +00:00
gdisirio af0a2cee78 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2407 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-11-21 12:28:46 +00:00
gdisirio 66c5a970fa git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2406 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-11-21 11:12:54 +00:00
gdisirio 43902259c6 Fixed bugs 3114266 and 3114319.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2404 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-11-21 09:41:46 +00:00
gdisirio a2e1f71fc2 Documentation related improvements.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2403 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-11-21 08:55:48 +00:00
gdisirio ef765be75f Fixed a misplaced comment in all the halconf.h files.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2394 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-11-20 11:13:15 +00:00
gdisirio 3ae01fd47b ARM7/9 port update, other improvements.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2389 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-11-19 18:45:11 +00:00
gdisirio 5008068ce4 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2386 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-11-18 13:09:41 +00:00
gdisirio a623601c72 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2385 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-11-17 14:16:05 +00:00
gdisirio 6e35bf9bd8 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2381 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-11-17 13:58:02 +00:00
gdisirio 5f707f9377 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2380 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-11-17 13:57:15 +00:00
gdisirio 605283dd16 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2379 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-11-17 13:56:04 +00:00
gdisirio 0655c8307f Small fix and re-tested.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2372 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-11-16 19:46:45 +00:00
gdisirio 354bd66eb0 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2371 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-11-16 18:39:47 +00:00
gdisirio 5962467685 Added STM32VL-Discovery demo. Changes to all the board files.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2370 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-11-15 19:44:09 +00:00
gdisirio b0d567f813 Added support for the STM32 Value Line.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2366 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-11-14 16:47:38 +00:00
gdisirio ce6fb29f60 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2365 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-11-14 13:42:46 +00:00
gdisirio 3d8808a39e git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2364 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-11-14 13:38:45 +00:00
gdisirio 7ab0cff418 Improved STM32 HAL support.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2363 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-11-14 13:29:09 +00:00
gdisirio bb6d225f57 Initial STM8L support.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2359 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-11-13 16:59:32 +00:00
gdisirio 1d6a323676 STM8L clock initialization now apparently working.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2358 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-11-13 09:59:02 +00:00
gdisirio be60d348aa git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2356 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-11-13 08:59:15 +00:00
gdisirio c62c1a4d62 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2350 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-11-12 18:59:49 +00:00
gdisirio 27654c1bb6 STM8L platform support (not tested yet).
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2347 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-11-11 18:51:10 +00:00
gdisirio a7b039fae4 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2345 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-11-10 21:46:34 +00:00
gdisirio e4cdc96106 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2344 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-11-10 19:26:40 +00:00
gdisirio 2e065803c9 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2341 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-11-10 14:36:26 +00:00
gdisirio e5c365f615 Documentation related fixes.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2340 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-11-09 18:50:57 +00:00
gdisirio d8be44136c Fixed bug 3100946, renamed HAL switches removing the CH_ part.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2326 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-11-01 17:29:56 +00:00
gdisirio 219606d05d Added STM8 SPI demo.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2320 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-11-01 14:05:59 +00:00
gdisirio 5da56bd07f git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2318 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-11-01 10:53:18 +00:00
gdisirio 4ed04c3764 STM8 SPI driver (untested).
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2316 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-11-01 10:03:30 +00:00
gdisirio a5c6d5b45b Added safety () around a macro parameter.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2315 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-11-01 09:20:34 +00:00
gdisirio a53d698bb3 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2314 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-10-31 14:05:31 +00:00
gdisirio 4f1b492119 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2313 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-10-31 13:06:42 +00:00
gdisirio e5d3bdcf76 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2312 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-10-31 11:18:41 +00:00
gdisirio 37e7834f45 New version numbers, fixed bug 3099701.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2311 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-10-31 08:34:16 +00:00
gdisirio 1ee9f242d6 Fixed an error.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2308 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-10-31 07:12:10 +00:00
gdisirio da52a1e8ca Documentation related fix.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2305 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-10-30 14:05:25 +00:00
gdisirio b8fd99cc2a Added polled API to the AT91SAM7 SPI driver.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2304 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-10-30 13:31:33 +00:00
gdisirio 76603ff540 Added polled API to the STM32 SPI driver.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2303 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-10-30 13:20:29 +00:00
gdisirio a884e58e2c Added a polled exchange function to the SPI driver model, implemented on LPCxxxx SPI drivers.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2302 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-10-30 11:18:28 +00:00
gdisirio 3ea8370651 LPC13xx SPI driver.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2300 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-10-28 18:39:40 +00:00
gdisirio 29a259ba43 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2299 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-10-27 20:53:37 +00:00
gdisirio ba10e94273 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2298 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-10-27 20:52:43 +00:00
gdisirio af2c001a10 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2297 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-10-27 19:36:41 +00:00
gdisirio 26e74eaef1 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2296 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-10-26 20:04:20 +00:00
gdisirio c44e7efce1 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2295 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-10-26 19:29:28 +00:00
gdisirio 36be20c723 Documentation fixes.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2294 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-10-26 18:17:19 +00:00
gdisirio 487a81e297 Documentation related changes.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2293 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-10-26 17:39:29 +00:00
gdisirio acbea2f1f3 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2292 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-10-25 20:34:08 +00:00
gdisirio 61922d458b git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2291 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-10-25 18:48:13 +00:00
gdisirio 19ca2c7515 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2289 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-10-25 08:57:47 +00:00