Commit Graph

249 Commits

Author SHA1 Message Date
gdisirio 18853dba22 Removed some obsolete code from the USB driver.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2715 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-02-06 10:02:08 +00:00
gdisirio 4e68b68d5a USB rework, step 2.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2714 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-02-06 09:51:16 +00:00
gdisirio 200f020df9 USB rework, step 1.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2708 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-02-05 09:27:20 +00:00
gdisirio 22781883e0 Merged the USB branch and made the needed adjustments, not tested yet.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2695 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-01-30 19:18:26 +00:00
gdisirio 5e31d55f74 Small fix to the STM32 serial driver.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2694 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-01-30 16:23:08 +00:00
gdisirio cee541cfa3 Implemented transmission end event.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2693 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-01-30 16:18:24 +00:00
gdisirio 00f3c1b8f3 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2672 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-01-22 14:13:49 +00:00
gdisirio f0e2c8c324 Fixed bug 3163851.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2664 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-01-22 09:52:08 +00:00
gdisirio 1664a6573e Fixed bug 3160306.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2663 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-01-20 19:07:07 +00:00
gdisirio 7474bb1c10 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2642 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-01-15 08:02:07 +00:00
gdisirio ac63722245 Added OTG clock setting to the STM32 HAL.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2641 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-01-15 08:01:07 +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 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 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 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 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 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 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 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 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 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 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 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 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
gdisirio b7e7258008 Unfinished AT91SAM7 SPI driver.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2266 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-10-17 19:40:36 +00:00
gdisirio a122640ac6 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2255 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-10-14 12:16:41 +00:00
gdisirio 4fab7c06d1 ADC, SPI, PWM driver enhancements.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2254 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-10-13 11:45:07 +00:00
gdisirio ec7455babe git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2253 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-10-12 20:47:30 +00:00
gdisirio eaaf043cda git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2251 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-10-12 17:59:47 +00:00
gdisirio 935e2fb27f git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2250 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-10-12 15:19:15 +00:00
gdisirio ee12fa3ad1 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2248 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-10-11 19:44:44 +00:00
gdisirio 441509bc2c git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2247 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-10-11 18:55:06 +00:00
gdisirio 7c2a8e13d9 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2246 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-10-11 11:48:03 +00:00
gdisirio f407e4a84f HAL improvements, mailboxes macro name changed.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2238 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-10-08 18:16:38 +00:00
gdisirio 2891f7d645 Documentation improvements, fixed a small error in the STM32 serial driver.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2234 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-10-04 17:16:18 +00:00
gdisirio fa774e9c8e Fixed bug 3078891.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2213 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-09-30 17:49:20 +00:00
gdisirio 781b0b129c Fixed bug 3064204.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2175 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-09-11 10:57:11 +00:00
gdisirio b3e95fd660 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2169 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-09-08 14:57:20 +00:00
gdisirio 18b825ef0c git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2167 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-09-07 13:37:22 +00:00
gdisirio f236e1de8b git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2165 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-09-05 14:35:24 +00:00
gdisirio bead7f814f git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2145 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-08-29 13:41:55 +00:00
gdisirio ae70bb24cc UART driver improvements.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2131 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-08-15 15:37:52 +00:00
gdisirio c36b827d05 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2130 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-08-14 14:15:44 +00:00
gdisirio a3723f2729 Fixed bug 3044770.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2128 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-08-14 06:57:40 +00:00
gdisirio 877faae2cf Fixed bug 3044758.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2127 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-08-14 06:40:28 +00:00
gdisirio 78c71e4870 Change to the STM32 SPI driver suggested by Liam.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2126 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-08-13 09:01:55 +00:00
gdisirio b01b63ed5a UART driver model improvements, templates and STM32 implementation updated.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2125 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-08-12 15:19:11 +00:00
gdisirio 6afde6bf19 STM32 ADC driver improvements.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2123 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-08-11 07:42:52 +00:00
gdisirio 1c64ee6921 STM32 related improvements, better SPI driver, improved DMA infrastructure.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2122 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-08-10 14:07:42 +00:00
gdisirio a2cfd2054a Fixed bug 3041414. Various improvements to the STM32 HAL.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2119 35acf78f-673a-0410-8e92-d51de3d6d3f4
2010-08-08 07:57:28 +00:00
gdisirio 8421c4e389 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2115 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-08-06 13:55:32 +00:00
gdisirio 6a05cd46d5 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2110 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-08-01 11:03:13 +00:00
gdisirio a927edc984 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2106 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-08-01 08:53:54 +00:00
gdisirio 1f7b57f575 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2104 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-07-31 09:53:35 +00:00
gdisirio 76a6057c1d git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2103 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-07-31 09:44:41 +00:00
gdisirio 28acd9ec85 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2102 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-07-31 08:06:30 +00:00
gdisirio 81cf255595 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2101 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-07-31 07:34:21 +00:00
gdisirio 5b5861688b git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2100 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-07-31 07:02:45 +00:00
gdisirio 8e4fd21b2b git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2099 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-07-31 06:46:17 +00:00
gdisirio da5080f92a git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2098 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-07-30 18:02:52 +00:00
gdisirio 5ff9f39050 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2097 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-07-30 12:55:50 +00:00
gdisirio a88c4972cf git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2096 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-07-29 13:35:17 +00:00
gdisirio 8249123228 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2095 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-07-27 14:44:28 +00:00
gdisirio 79b97b0f60 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2094 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-07-27 10:31:19 +00:00
gdisirio b91f48eb10 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2093 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-07-27 08:36:01 +00:00
gdisirio 5b4d534a2c git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2092 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-07-26 18:53:02 +00:00
gdisirio b1034e1211 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2091 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-07-26 17:05:51 +00:00
gdisirio 8c836a17ff git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2090 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-07-26 15:01:58 +00:00