Commit Graph

184 Commits (15e182dd827a48ab6f5f040f052ac201a915f2bc)

Author SHA1 Message Date
gdisirio 0d96f5c78e git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@5859 35acf78f-673a-0410-8e92-d51de3d6d3f4 2013-06-16 12:21:30 +00:00
gdisirio 0755c754f4 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5807 35acf78f-673a-0410-8e92-d51de3d6d3f4 2013-06-03 18:43:23 +00:00
theshed 51af0586c9 More LPC122x drivers from Marcin J.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5794 35acf78f-673a-0410-8e92-d51de3d6d3f4
2013-06-01 22:00:28 +00:00
gdisirio 09b9d8de34 Fixed bug #411.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5782 35acf78f-673a-0410-8e92-d51de3d6d3f4
2013-06-01 08:15:09 +00:00
gdisirio 74bc33cf80 Fixed bug bug #414.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5779 35acf78f-673a-0410-8e92-d51de3d6d3f4
2013-06-01 07:57:54 +00:00
gdisirio 7f97aa2059 LWIP patch for sockets.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5739 35acf78f-673a-0410-8e92-d51de3d6d3f4
2013-05-18 07:48:11 +00:00
gdisirio 50fe4f680f git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5707 35acf78f-673a-0410-8e92-d51de3d6d3f4 2013-05-11 10:17:48 +00:00
gdisirio e4c2e5ed22 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5697 35acf78f-673a-0410-8e92-d51de3d6d3f4 2013-05-11 06:08:17 +00:00
gdisirio 6853fa7a76 Fixed lwIP initialization code.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5628 35acf78f-673a-0410-8e92-d51de3d6d3f4
2013-04-26 12:36:18 +00:00
barthess 5597fabe0b CPP wrapper. In mailbox class added methods getFreeCountI() and getUsedCountI()
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5594 35acf78f-673a-0410-8e92-d51de3d6d3f4
2013-04-18 14:58:58 +00:00
gdisirio 4e220bdc67 Fixed bug #401.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5590 35acf78f-673a-0410-8e92-d51de3d6d3f4
2013-04-14 09:12:49 +00:00
gdisirio 00d0a134ec Small fix to chprintf().
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5556 35acf78f-673a-0410-8e92-d51de3d6d3f4
2013-04-07 08:02:48 +00:00
gdisirio 01f971ba1d Adjusted C file templates.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5339 35acf78f-673a-0410-8e92-d51de3d6d3f4
2013-02-28 16:23:19 +00:00
gdisirio d4c246e1bf Documentation related fixes.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5298 35acf78f-673a-0410-8e92-d51de3d6d3f4
2013-02-22 11:34:04 +00:00
gdisirio 4149bab2ca git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5297 35acf78f-673a-0410-8e92-d51de3d6d3f4 2013-02-22 10:34:57 +00:00
gdisirio 184a71345c Updated license years.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5102 35acf78f-673a-0410-8e92-d51de3d6d3f4
2013-02-02 10:58:09 +00:00
gdisirio 9754c3a6ce Option for lwip link status poll interval.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5047 35acf78f-673a-0410-8e92-d51de3d6d3f4
2013-01-09 09:34:48 +00:00
gdisirio fe7aa77ae0 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5038 35acf78f-673a-0410-8e92-d51de3d6d3f4 2013-01-07 09:53:34 +00:00
gdisirio 739e24c329 Merged another patch to the C++ wrapper.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5036 35acf78f-673a-0410-8e92-d51de3d6d3f4
2013-01-06 09:10:58 +00:00
gdisirio aaa126da62 Fixed bug 3599328.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5033 35acf78f-673a-0410-8e92-d51de3d6d3f4
2013-01-05 09:42:13 +00:00
gdisirio 6f470322d0 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5032 35acf78f-673a-0410-8e92-d51de3d6d3f4 2013-01-04 15:11:03 +00:00
gdisirio 77f68f1c5b git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5030 35acf78f-673a-0410-8e92-d51de3d6d3f4 2013-01-04 10:26:22 +00:00
gdisirio 66205faf65 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5029 35acf78f-673a-0410-8e92-d51de3d6d3f4 2013-01-04 09:38:41 +00:00
gdisirio c95f632a67 Added an iclass to the C++ wrapper.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5028 35acf78f-673a-0410-8e92-d51de3d6d3f4
2013-01-03 18:28:21 +00:00
gdisirio b5da4b76b5 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5027 35acf78f-673a-0410-8e92-d51de3d6d3f4 2013-01-03 16:17:42 +00:00
gdisirio 87a513da86 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5025 35acf78f-673a-0410-8e92-d51de3d6d3f4 2013-01-03 11:32:45 +00:00
gdisirio e2adb48040 Missing virtual...
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5023 35acf78f-673a-0410-8e92-d51de3d6d3f4
2013-01-03 10:22:48 +00:00
gdisirio d86e97b242 Added support for BaseSequentialStream to the C++ wrapper.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5022 35acf78f-673a-0410-8e92-d51de3d6d3f4
2013-01-03 10:21:42 +00:00
gdisirio 865722b1be Added queues and core.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5021 35acf78f-673a-0410-8e92-d51de3d6d3f4
2013-01-03 09:52:04 +00:00
gdisirio 3edb2cf553 Added memory pools to the C++ wrapper.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5020 35acf78f-673a-0410-8e92-d51de3d6d3f4
2013-01-02 18:42:39 +00:00
gdisirio f0526e72d8 Added mailboxes to the C++ wrapper.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5018 35acf78f-673a-0410-8e92-d51de3d6d3f4
2013-01-02 15:00:20 +00:00
gdisirio 04db761f7e git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5017 35acf78f-673a-0410-8e92-d51de3d6d3f4 2013-01-02 14:01:11 +00:00
gdisirio c66db01792 Semaphores wrapper improved and completed.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5016 35acf78f-673a-0410-8e92-d51de3d6d3f4
2013-01-02 13:30:07 +00:00
gdisirio d51863a353 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5013 35acf78f-673a-0410-8e92-d51de3d6d3f4 2013-01-02 10:47:01 +00:00
gdisirio 64e7fd5a53 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5012 35acf78f-673a-0410-8e92-d51de3d6d3f4 2013-01-02 10:11:02 +00:00
gdisirio f26d653e46 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5011 35acf78f-673a-0410-8e92-d51de3d6d3f4 2013-01-02 08:49:45 +00:00
gdisirio 462ab6bcaf git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5010 35acf78f-673a-0410-8e92-d51de3d6d3f4 2013-01-02 08:32:03 +00:00
gdisirio 12286fd5e4 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5009 35acf78f-673a-0410-8e92-d51de3d6d3f4 2013-01-01 15:46:10 +00:00
gdisirio 1be8fe145c C++ wrapper prototype, not complete yet.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5008 35acf78f-673a-0410-8e92-d51de3d6d3f4
2013-01-01 15:42:44 +00:00
gdisirio 7dae784676 Fixes to the CPP wrapper.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5006 35acf78f-673a-0410-8e92-d51de3d6d3f4
2013-01-01 09:37:24 +00:00
gdisirio df51e160c1 Updated lwIP to 1.4.1.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4949 35acf78f-673a-0410-8e92-d51de3d6d3f4
2012-12-22 10:19:34 +00:00
gdisirio 5ababb428e Fixed bug 3576771.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4758 35acf78f-673a-0410-8e92-d51de3d6d3f4
2012-10-13 11:01:46 +00:00
gdisirio 600714519b Fixed bug 3575662.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4753 35acf78f-673a-0410-8e92-d51de3d6d3f4
2012-10-13 09:34:22 +00:00
gdisirio dfe1ebcefa Fixed bug 3571053.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4727 35acf78f-673a-0410-8e92-d51de3d6d3f4
2012-09-29 08:39:25 +00:00
gdisirio 2f34399361 Fixed bug 3570135.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4723 35acf78f-673a-0410-8e92-d51de3d6d3f4
2012-09-29 08:15:09 +00:00
barthess 7a68e17dd0 RTCv1. Added FAT timestamp support in driver using chrtclib for deviced without hardware calendar.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4706 35acf78f-673a-0410-8e92-d51de3d6d3f4
2012-09-21 09:26:41 +00:00
barthess 54cde6b854 RTCv2. Get fat time function moved to driver.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4701 35acf78f-673a-0410-8e92-d51de3d6d3f4
2012-09-20 15:01:28 +00:00
gdisirio d4fd78d689 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4700 35acf78f-673a-0410-8e92-d51de3d6d3f4 2012-09-19 18:02:50 +00:00
barthess 892e73121a RTC. Fixed bug 3568626.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4694 35acf78f-673a-0410-8e92-d51de3d6d3f4
2012-09-19 12:25:05 +00:00
gdisirio bd02ccd121 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4639 35acf78f-673a-0410-8e92-d51de3d6d3f4 2012-09-09 06:57:50 +00:00
gdisirio cf3cee51d1 Fixed bug 3564134.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4630 35acf78f-673a-0410-8e92-d51de3d6d3f4
2012-09-02 13:28:49 +00:00
gdisirio d3100d6ab2 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4626 35acf78f-673a-0410-8e92-d51de3d6d3f4 2012-08-28 13:30:29 +00:00
gdisirio 546f0c3c31 Float tentative fix.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4476 35acf78f-673a-0410-8e92-d51de3d6d3f4
2012-07-22 08:45:48 +00:00
gdisirio 984ac2de92 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4367 35acf78f-673a-0410-8e92-d51de3d6d3f4 2012-06-30 19:02:58 +00:00
gdisirio 90588da244 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4365 35acf78f-673a-0410-8e92-d51de3d6d3f4 2012-06-30 15:46:06 +00:00
gdisirio 853b0fd51c git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4348 35acf78f-673a-0410-8e92-d51de3d6d3f4 2012-06-26 18:02:43 +00:00
gdisirio de6bbbb9ef git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4307 35acf78f-673a-0410-8e92-d51de3d6d3f4 2012-06-19 16:47:09 +00:00
gdisirio 9057c6c72b git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4294 35acf78f-673a-0410-8e92-d51de3d6d3f4 2012-06-18 16:22:34 +00:00
gdisirio 2b1173e292 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4276 35acf78f-673a-0410-8e92-d51de3d6d3f4 2012-06-14 16:45:57 +00:00
gdisirio 661cf8e8dc git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4230 35acf78f-673a-0410-8e92-d51de3d6d3f4 2012-05-22 19:45:00 +00:00
barthess ec65999d9b chrtclib. Fixed overflows in mcrosecond functions. Fixed initializations of RTCTime structs in functions.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4217 35acf78f-673a-0410-8e92-d51de3d6d3f4
2012-05-19 15:39:24 +00:00
barthess 581267b0db chrtclib. Added forgotten prototype.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4216 35acf78f-673a-0410-8e92-d51de3d6d3f4
2012-05-19 15:37:26 +00:00
gdisirio 1606d4ea9f Documentation related fix.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4209 35acf78f-673a-0410-8e92-d51de3d6d3f4
2012-05-18 15:37:58 +00:00
gdisirio 97dce7b944 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4180 35acf78f-673a-0410-8e92-d51de3d6d3f4 2012-05-10 12:26:24 +00:00
gdisirio d0a2e55ed0 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4175 35acf78f-673a-0410-8e92-d51de3d6d3f4 2012-05-08 17:09:20 +00:00
gdisirio c391fe3413 Fixed bug 3523769.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4167 35acf78f-673a-0410-8e92-d51de3d6d3f4
2012-05-06 10:33:18 +00:00
gdisirio 45591068e8 Reformatting and documentation related fixes.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4147 35acf78f-673a-0410-8e92-d51de3d6d3f4
2012-04-29 18:06:23 +00:00
gdisirio f0152ab13b Integrated FatFS 0.9, changes to the FatFS demos and integration files.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4120 35acf78f-673a-0410-8e92-d51de3d6d3f4
2012-04-22 10:47:39 +00:00
gdisirio 31fa09fa03 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4118 35acf78f-673a-0410-8e92-d51de3d6d3f4 2012-04-21 17:26:34 +00:00
gdisirio 37f359fbaa git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4117 35acf78f-673a-0410-8e92-d51de3d6d3f4 2012-04-20 13:31:43 +00:00
gdisirio 814b642a0c git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4112 35acf78f-673a-0410-8e92-d51de3d6d3f4 2012-04-18 16:40:15 +00:00
barthess 72e66cd47c SDC. Merged code from development branch.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4106 35acf78f-673a-0410-8e92-d51de3d6d3f4
2012-04-17 18:09:27 +00:00
gdisirio 6b7ee6dc16 Added mail pools.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4089 35acf78f-673a-0410-8e92-d51de3d6d3f4
2012-04-09 14:51:29 +00:00
gdisirio 105f342d84 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4035 35acf78f-673a-0410-8e92-d51de3d6d3f4 2012-03-11 17:06:33 +00:00
gdisirio 88a1e9443e Merged enhanced chprintf().
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4034 35acf78f-673a-0410-8e92-d51de3d6d3f4
2012-03-11 17:02:06 +00:00
barthess 3c311dfe58 RTC. High level staff moved to chrtclib.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/sdc_dev2@4032 35acf78f-673a-0410-8e92-d51de3d6d3f4
2012-03-09 18:33:26 +00:00
gdisirio 8f51084625 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4002 35acf78f-673a-0410-8e92-d51de3d6d3f4 2012-02-29 16:28:33 +00:00
gdisirio 7664f48ad0 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4000 35acf78f-673a-0410-8e92-d51de3d6d3f4 2012-02-29 14:37:49 +00:00
gdisirio 737aa2d9dd Thread names to lwIP related threads.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3999 35acf78f-673a-0410-8e92-d51de3d6d3f4
2012-02-29 14:13:52 +00:00
gdisirio 84f2c0ef32 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3998 35acf78f-673a-0410-8e92-d51de3d6d3f4 2012-02-29 14:05:19 +00:00
gdisirio 26c301ec2c Added STM32 lwIP demo (untested).
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3990 35acf78f-673a-0410-8e92-d51de3d6d3f4
2012-02-26 17:52:55 +00:00
gdisirio 18b8b49524 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3946 35acf78f-673a-0410-8e92-d51de3d6d3f4 2012-02-08 17:53:52 +00:00
gdisirio f231e6dbdd git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3847 35acf78f-673a-0410-8e92-d51de3d6d3f4 2012-01-21 19:43:40 +00:00
gdisirio de5dcbba85 License text updated with new year.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3846 35acf78f-673a-0410-8e92-d51de3d6d3f4
2012-01-21 14:29:42 +00:00
gdisirio 8deb48a034 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3818 35acf78f-673a-0410-8e92-d51de3d6d3f4 2012-01-16 11:41:04 +00:00
gdisirio c498fdc4d6 Added time conversions to RT counter code. Documentation improvements.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3728 35acf78f-673a-0410-8e92-d51de3d6d3f4
2012-01-04 14:29:02 +00:00
gdisirio b89c65bd8d Added MEMS support to the STM32F4-Discovery demo.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3702 35acf78f-673a-0410-8e92-d51de3d6d3f4
2012-01-01 13:16:19 +00:00
gdisirio 39f9216bbc git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3635 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-12-18 08:27:30 +00:00
gdisirio 7a9ba73df8 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3464 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-11-03 18:07:58 +00:00
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 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 614b996135 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3371 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-09-20 17:46:03 +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
barthess 5a3a608ad9 Fixed bug 3411207
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3360 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-09-20 16:00:30 +00:00
barthess 62b5054dfa Shell. Added possibility to create statically allocated shell thread.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3331 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-09-17 21:06:25 +00:00
barthess cd04106a83 Added date/time of build in "info" screen.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3291 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-09-06 14:06:43 +00:00
gdisirio a53bc3d266 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3137 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-07-09 07:32:27 +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 e10edf1683 Dedicated printf implementation.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3092 35acf78f-673a-0410-8e92-d51de3d6d3f4
2011-06-27 19:57:11 +00:00
gdisirio fdf08e2a41 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3091 35acf78f-673a-0410-8e92-d51de3d6d3f4 2011-06-27 15:00:05 +00:00