Commit Graph

798 Commits

Author SHA1 Message Date
gdisirio d0dfc3715a git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3044 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-06-14 15:09:28 +00:00
gdisirio a746de44e1 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3043 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-06-14 08:10:38 +00:00
gdisirio 792c06e585 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3042 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-06-12 14:22:48 +00:00
gdisirio 3cdb6f6ed6 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3041 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-06-11 10:49:51 +00:00
gdisirio d553080cd9 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3032 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-06-06 17:17:43 +00:00
gdisirio ed8a14e688 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3031 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-06-06 09:33:47 +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 9b147c2551 SDC driver state machine improved.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3027 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-06-05 07:05:29 +00:00
gdisirio 6fd3079b30 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3026 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-06-04 15:41:07 +00:00
gdisirio 2d4aff80dc git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3025 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-06-04 13:30:13 +00:00
gdisirio ac3795ec52 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3024 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-06-04 08:43:00 +00:00
gdisirio 821bc9f643 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3023 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-06-04 07:54:53 +00:00
gdisirio d08ed6e93c Alternate preemption mode added to IAR port too.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3016 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-06-02 14:49:16 +00:00
gdisirio e5046d1dcb Alternate preemption mode implemented for RVCT.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3014 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-06-02 14:26:17 +00:00
gdisirio 58cf0fbdc6 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3010 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-06-02 11:49:37 +00:00
gdisirio a3ec9940d0 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3009 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-06-02 11:49:15 +00:00
gdisirio 2c02959951 Compact mode implemented and tested for RVCT too.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3007 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-06-02 08:59:32 +00:00
gdisirio a8e9f2ed9c Compact mode working in IAR port.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3006 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-06-02 08:33:51 +00:00
gdisirio 03c0617a9f git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3004 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-05-29 16:39:51 +00:00
gdisirio 4015cc5e3a git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3003 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-05-29 16:37:45 +00:00
gdisirio b3ab17b278 Reordered STM32 drivers default DMA priorities.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2994 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-05-22 09:45:47 +00:00
gdisirio bf5a88b425 Reordered the build sequence to avoid the idiotic STM8 stack limit.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2990 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-05-21 07:15:40 +00:00
gdisirio 6b6790350e git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2980 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-05-19 18:54:35 +00:00
gdisirio 3495905f51 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2974 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-05-19 17:46:52 +00:00
gdisirio b4aa14e88c git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2971 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-05-18 09:03:50 +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 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 391474c15f git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2956 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-05-14 07:11:40 +00:00
gdisirio 67e6534f65 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2955 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-05-14 07:05:46 +00:00
gdisirio b0af64e71f git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2954 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-05-14 05:27:09 +00:00
gdisirio 8af2607871 Updated HAL configuration files with SDC driver settings.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2953 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-05-14 05:24:10 +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 463a7d9bc1 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2948 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-05-12 17:44:13 +00:00
gdisirio 82215e7019 All halcof.h files updated for the SDC driver.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2932 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-05-08 09:16:22 +00:00
gdisirio dfc2c1e189 Updated all the HAL configuration files.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2900 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-04-23 17:37:09 +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 c878b791eb Cortex-Mx linker scripts updated.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2885 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-04-17 16:46:51 +00:00
gdisirio d43e444377 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2884 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-04-17 14:41:19 +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 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 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 8bfbb8d4d9 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2873 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-04-10 09:52:42 +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 be4c72c7a3 Updated the various STM32 mcuconf.h files with the ICU settings.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2859 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-04-01 09:11:35 +00:00
gdisirio 91e4dee81e Generic improvements to the GPT driver organization.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2854 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-03-31 12:35:42 +00:00
gdisirio 0653f7de9c git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2832 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-03-19 12:08:15 +00:00
gdisirio f8c1d7423e Added IAR and Keil projects for STM32F107.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2831 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-03-19 12:07:03 +00:00
gdisirio e7e79a6ccb License updated.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2827 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-03-18 18:38:08 +00:00
gdisirio 887409c0c9 STM32 HAL improvements (CL devices).
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2820 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-03-12 11:19:24 +00:00
gdisirio 3ed4800b9b git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2819 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-03-12 08:34:29 +00:00
gdisirio 3e8aa7cd6a git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2818 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-03-12 08:25:16 +00:00
gdisirio 18fb8f676f git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2808 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-03-08 10:09:57 +00:00
gdisirio 5ab1f418c8 LPC13xx GPT driver added (not tested yet).
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2799 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-03-06 08:46:51 +00:00
gdisirio d17660452e GPT driver for LPC11xx (not tested yet).
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2794 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-03-05 18:35:10 +00:00
gdisirio 761f9f7287 Updated the various halconf.h and mcuconf.h with the GPT settings.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2782 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-02-28 19:28:47 +00:00
gdisirio 6f6e1a6401 Improved messages subsystem.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2759 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-02-23 18:59:39 +00:00
gdisirio db7b60f402 Modified all the halconf.h files to include the USB and Serial over USB drivers.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2753 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-02-20 15:26:43 +00:00
gdisirio 6a2c26a1db Updated the mcuconf.h file in the STM32 demos to include the USB parameters.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2752 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-02-20 15:13:14 +00:00
gdisirio 1b43d44a84 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2670 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-01-22 12:09:06 +00:00
gdisirio fdad6c0c8f git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2668 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-01-22 11:36:04 +00:00
gdisirio 5e65784681 Updated CB example project.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2667 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-01-22 11:35:38 +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 a51fdbd0a7 Removed .uvopt files from the Keil projects.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2644 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-01-15 11:15:07 +00:00
gdisirio 6e11b18986 Fixed bug 3158776.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2643 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-01-15 10:14:20 +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 8f86368f15 Fixed bug 3153746.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2632 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-01-09 18:09:20 +00:00
gdisirio 7db9cb86d0 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2630 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-01-09 14:26:15 +00:00
gdisirio b4319d0aab Removed some instances of sdflags_t.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2627 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-01-09 10:39:16 +00:00
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 f861470e79 IAR Cortex-M0 port working but there is no report because the compiler limits the size to just 8KB, not enough for the test suite.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2621 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-01-08 17:37:05 +00:00
gdisirio 52c033d27e Cortex-M0 RCTV port.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2619 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-01-08 16:45:56 +00:00
gdisirio 55173b29da git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2618 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-01-08 14:58:27 +00:00
gdisirio e01b1f1f1e git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2617 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-01-08 13:40:44 +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 d87a13eb62 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2612 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-01-07 17:19:43 +00:00
gdisirio 93a20bf96e git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2611 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-01-07 17:10:43 +00:00
gdisirio 1ee2f9cedb git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2608 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-01-07 16:38:47 +00:00
gdisirio 874dc4933f git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2607 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-01-07 13:30:52 +00:00
gdisirio f2a01fd776 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2606 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-01-07 13:24:31 +00:00
gdisirio addb5e3777 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2605 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-01-07 13:22:03 +00:00
gdisirio f933219560 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2604 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-01-07 13:18:24 +00:00
gdisirio 645242ceb8 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2603 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-01-07 13:03:12 +00:00
gdisirio 9095897d13 IAR and Keil reports for the STM32VL-Discovery.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2601 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-01-07 11:30:26 +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 3d8343e464 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2595 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-01-06 10:56: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 6fdb361bf1 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2593 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-01-06 10:12:10 +00:00
gdisirio 85dd366dd4 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2592 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-01-06 10:05:23 +00:00
gdisirio d6e350274d Changed the stack sections names in the IAR port.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2591 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-01-06 09:59:37 +00:00
gdisirio 5108791c23 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2590 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-01-06 09:49:19 +00:00
gdisirio 6b2d2c0a2c git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2589 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-01-06 09:48:54 +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 582b0dbf53 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2530 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-12-24 21:09:59 +00:00
gdisirio 6e77c15848 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2529 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-12-24 21:07:58 +00:00
gdisirio 414e792575 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2528 35acf78f-673a-0410-8e92-d51de3d6d3f4 2010-12-24 21:07:11 +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