Commit Graph

925 Commits

Author SHA1 Message Date
gdisirio 2f572f109a USB enhancements, phase two.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3451 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-10-23 12:21:44 +00:00
gdisirio 309b1e4114 Improvements to the USB driver, first phase.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3449 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-10-23 11:39:45 +00:00
gdisirio 4e3f49400a git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3447 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-10-15 13:24:40 +00:00
gdisirio 36d1e0978a Finalized AVR PAL driver.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3441 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-10-10 18:08:37 +00:00
gdisirio b8aac8295e git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3438 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-10-08 14:23:08 +00:00
gdisirio ef48678d56 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3435 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-10-08 10:55:44 +00:00
gdisirio 560ce194e0 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3434 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-10-08 10:50:53 +00:00
gdisirio 8cc4b7f2e8 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3432 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-10-08 10:48:52 +00:00
gdisirio 538f257a67 New build system for GCC ARM ports.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3428 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-10-08 09:22:34 +00:00
gdisirio 1351fded5a git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3426 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-10-05 17:00:13 +00:00
gdisirio 85cf040f27 Fixed bug 3418626.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3425 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-10-04 20:25:26 +00:00
gdisirio 9422ad779c Fixed bug 3418620.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3424 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-10-04 20:01:46 +00:00
gdisirio 8ce9365e00 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3411 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-09-25 15:31:46 +00:00
gdisirio bede8d6781 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3410 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-09-25 15:18:18 +00:00
gdisirio 81d6a0d4b6 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3402 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-09-25 06:20:11 +00:00
gdisirio d379346fad Updated Keil demos.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3397 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-09-24 10:41:58 +00:00
gdisirio da02a90b8c Fixed bug 3413558.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3396 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-09-24 10:34:03 +00:00
gdisirio f4d189fe8e STM32 IAR projects updated.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3395 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-09-24 09:13:08 +00:00
gdisirio d528722d4e git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3390 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-09-24 07:30:23 +00:00
gdisirio 76d35140c9 IAR startup updated to export symbol __main_thread_stack_base__.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3388 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-09-24 07:11:11 +00:00
gdisirio c39d08fc2a git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3384 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-09-23 15:48:55 +00:00
gdisirio 4a3e3fc01e git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3381 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-09-22 14:53:42 +00:00
gdisirio ae42ff1857 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3377 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-09-21 17:10:15 +00:00
gdisirio a4a5c507fe Updated readme.txt.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3370 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-09-20 17:44:29 +00:00
gdisirio 01596d8b5e Fixed bug 3411774.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3367 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-09-20 17:33:38 +00:00
gdisirio 2eae001460 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3365 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-09-20 17:14:50 +00:00
gdisirio 5463b41d3a git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3362 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-09-20 17:08:22 +00:00
gdisirio 0022c9cd55 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3337 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-09-18 09:59:07 +00:00
gdisirio 3a94137eb3 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3320 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-09-16 17:38:22 +00:00
gdisirio 792d85bcb5 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3287 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-09-03 12:35:41 +00:00
gdisirio d2e9a52cf6 New DMA helper driver for STM32F1xx and STM32L1xx.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3255 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-08-28 08:53:14 +00:00
gdisirio 334ee69708 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3247 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-08-22 08:40:34 +00:00
gdisirio 24cad7ea0d git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3245 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-08-22 08:31:32 +00:00
gdisirio 875feb998f Integrated FatFS version 0.8B.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3240 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-08-16 13:37:53 +00:00
gdisirio 9741231ed7 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3234 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-08-14 12:27:46 +00:00
gdisirio 5cee2c08d7 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3226 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-08-13 15:40:57 +00:00
gdisirio aaad958769 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3224 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-08-13 07:06:02 +00:00
gdisirio e0309ba973 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3222 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-08-12 06:47:30 +00:00
gdisirio b9933c2089 Implemented system state checker debug option, remove the option CH_USE_NESTED_LOCKS. Documentation improvements and fixes.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3221 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-08-11 17:51:37 +00:00
gdisirio 50a41618be git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3220 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-08-10 09:17:04 +00:00
gdisirio cbcbaa0efe git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3213 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-08-09 08:12:47 +00:00
gdisirio cd7e1aa36d Merged CMSIS 2.1 files.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3212 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-08-08 12:14:35 +00:00
gdisirio 26eabc0db1 Centralyzed ARM scatter files too, new stack checking implemented in ARM port.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3210 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-08-08 10:01:14 +00:00
gdisirio 9c9ca16e05 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3208 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-08-08 07:50:54 +00:00
gdisirio f005ce481f git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3207 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-08-07 16:52:40 +00:00
gdisirio aa865517b8 Centralyzed scatter files for GCC ARMCMx port.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3201 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-08-07 14:43:52 +00:00
gdisirio bc6c79a1b3 Fixed bug 3387671.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3196 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-08-07 09:58:15 +00:00
gdisirio 075ff711f1 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3192 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-08-07 09:00:12 +00:00
gdisirio 0c276798fd git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3188 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-08-01 14:33:04 +00:00
gdisirio de33542372 Provisional STM32L1xx and STM32F2xx support.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3180 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-07-27 12:22:07 +00:00
gdisirio 38c17ef7ce Fixed bug 3361039.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3165 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-07-19 18:48:10 +00:00
gdisirio 2e5abeebad git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3158 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-07-13 19:26:41 +00:00
gdisirio fbdd64538e git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3144 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-07-10 08:45:36 +00:00
gdisirio b38e1f2c96 Improvements to the trace buffer and other debug features.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3139 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-07-09 09:15:49 +00:00
gdisirio d79eea31a2 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3135 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-07-08 19:29:00 +00:00
gdisirio 83c5424c5f Fixed bug 3351556.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3108 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-07-03 15:29:13 +00:00
gdisirio 30dd0fdc16 TIM8 support for STM32.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3098 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-06-29 11:59:15 +00:00
gdisirio ddc9ded3f0 chprintf() implemented, improved the shell.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3093 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-06-28 06:29:04 +00:00
gdisirio 51875dac89 Fixed bug 3317500, retested impacted ports.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3047 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-06-16 19:56:47 +00:00
gdisirio 060e34a409 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3038 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-06-08 15:32:34 +00:00
gdisirio 46b915b0fd git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3037 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-06-08 14:43:03 +00:00
gdisirio 7e6b563be0 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3033 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-06-06 17:53:43 +00:00
gdisirio 079f323649 Fixed bug 3311999.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3029 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-06-05 18:19:05 +00:00
gdisirio 03b4c7ddcb FatFs demo for the STM32F103ZG using the SDC driver.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3028 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-06-05 08:39:49 +00:00
gdisirio 8aa98a8b06 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3017 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-06-02 17:33:57 +00:00
gdisirio 33ecba3fd8 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3005 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-06-01 17:56:23 +00:00
gdisirio 9b9bd471ed Enhancements to the SDC driver.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3002 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-05-29 16:19:21 +00:00
gdisirio 88e92b3fc3 Improvements to the STM32 SDC driver.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3001 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-05-29 09:09:22 +00:00
gdisirio 3003454605 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2984 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-05-20 12:57:01 +00:00
gdisirio f4ec81ae14 USB CDC functionality restored, more improvements to the I/O queues.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2983 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-05-20 12:46:24 +00:00
gdisirio dfd3915859 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2978 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-05-19 18:19:24 +00:00
gdisirio 5e1249af26 Fixed bug 3303841.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2973 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-05-19 09:13:24 +00:00
gdisirio 807c5f1882 Fixed bug 3303908.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2972 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-05-18 17:54:55 +00:00
gdisirio ade5cc3c6f git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2970 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-05-17 17:17:16 +00:00
gdisirio a07d46f30a ARMv7-M compact kernel mode working.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2968 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-05-17 17:04:12 +00:00
gdisirio e0b5335015 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2966 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-05-17 14:49:51 +00:00
gdisirio b793081d96 Fixed bug 3302420.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2964 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-05-15 13:05:47 +00:00
gdisirio 85f17ebe01 Customer CR.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2951 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-05-13 17:20:39 +00:00
gdisirio 16feb88c2d Fixed STM8S SPI driver. Fixed STM32 DMA2 channels 4 and 5 sharing.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2949 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-05-13 09:03:46 +00:00
gdisirio 0cb8d71e9d SDC improvements.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2946 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-05-10 18:33:49 +00:00
gdisirio 86e53137e1 Fixed bug 3299306.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2942 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-05-09 07:48:43 +00:00
gdisirio 88d64d091d Fixed bug 3298889.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2929 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-05-08 06:12:32 +00:00
gdisirio ccbfd6ecc0 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2901 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-04-25 12:41:47 +00:00
gdisirio 9a29560d71 Fixed bug 3292084.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2898 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-04-23 17:20:08 +00:00
gdisirio 0f11c375d3 Added STM32F103ZG demo for STM3210E-EVAL board.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2896 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-04-23 12:23:44 +00:00
gdisirio 8e51a4e76a Fixed bug 3291898.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2888 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-04-23 08:41:42 +00:00
gdisirio 6a57dd25e0 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2883 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-04-17 13:55:31 +00:00
gdisirio aeed6d78c1 Fixed bug 3288149.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2881 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-04-16 09:27:46 +00:00
gdisirio faed89a33d C++ demo for STM32.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2880 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-04-16 09:18:36 +00:00
gdisirio 786a0a6c71 Fixed bug 3288112.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2878 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-04-16 06:30:12 +00:00
gdisirio 618a978da8 Added DMA sharing in the STM32 HAL.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2874 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-04-10 16:45:41 +00:00
gdisirio de877486ef Fixed bug 3276379.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2872 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-04-09 15:10:15 +00:00
gdisirio ad009f46d5 STM32 PWM driver optimization, changed the behavior of pwmChangePeriod().
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2869 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-04-05 18:21:00 +00:00
gdisirio c4fec713d2 Improvements to the PAL drivers.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2867 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-04-03 11:29:27 +00:00
gdisirio d8420eb83a Added advanced mode and BTRD handling to the STM32 PWM driver.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2861 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-04-01 13:06:44 +00:00
gdisirio a58a524d4c Improvements to the PWM driver.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2853 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-03-31 10:21:52 +00:00
gdisirio f5ae255230 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2850 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-03-29 14:51:08 +00:00
gdisirio ff676aee33 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2848 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-03-28 15:32:56 +00:00
gdisirio 8df3af0e14 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2840 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-03-24 08:30:21 +00:00
gdisirio 506212845d git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2839 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-03-23 13:12:41 +00:00