hidnplayr
33ab203c14
Sync net branch with trunk
...
git-svn-id: svn://kolibrios.org@2385 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-23 19:01:26 +00:00
hidnplayr
e7bade16fe
Adapted more structures to use new struct.inc
...
git-svn-id: svn://kolibrios.org@2384 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-23 18:52:13 +00:00
hidnplayr
e6242dd229
Synced net branch with trunk
...
git-svn-id: svn://kolibrios.org@2382 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-22 16:06:05 +00:00
hidnplayr
58fe32f210
Usage of struct.inc from fasm in trunk kernel.
...
git-svn-id: svn://kolibrios.org@2381 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-22 15:46:09 +00:00
hidnplayr
586aa010e8
Trying to fix the makefile for new stack
...
git-svn-id: svn://kolibrios.org@2373 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-22 13:20:18 +00:00
hidnplayr
8030c874a3
Fixed problem with UDP_input when checksum was 0.
...
git-svn-id: svn://kolibrios.org@2369 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-22 10:44:57 +00:00
hidnplayr
dc66507e60
Bugfixes in net branch:
...
-Disabled UDP remote IP checking because it blocks valid packets in certain situations (DNS resolving)
-Removed device '0' (application level) as default device because it was not correctly implemented and would require a lot of changes. Yet need to find a better solution for this.
git-svn-id: svn://kolibrios.org@2366 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-21 14:09:00 +00:00
hidnplayr
599bb8d0bd
Reserved sysfn 74,75,76 in trunk for new stack.
...
git-svn-id: svn://kolibrios.org@2365 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-21 11:00:54 +00:00
hidnplayr
e8a8f9b75d
Changed net branch specific kernel function numbers to make room for function 73 in main branch.
...
git-svn-id: svn://kolibrios.org@2364 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-21 10:57:36 +00:00
hidnplayr
f156bb294d
Markup changes in net branch + updates in TCP_output
...
git-svn-id: svn://kolibrios.org@2362 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-21 08:44:51 +00:00
Sergey Semyonov (Serge)
d328d0e037
export destroy_event and timer_hs
...
git-svn-id: svn://kolibrios.org@2356 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-19 12:48:21 +00:00
Marat Zakiyanov (Mario79)
a2109c90b2
Fix for f38 - correction for the remainder of the division
...
git-svn-id: svn://kolibrios.org@2353 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-18 17:56:20 +00:00
Artem Jerdev (art_zh)
db3a775207
one old and stupid bug fixed
...
git-svn-id: svn://kolibrios.org@2350 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-15 22:56:09 +00:00
Sergey Semyonov (Serge)
9dadf069ea
export free_page
...
git-svn-id: svn://kolibrios.org@2343 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-04 13:21:17 +00:00
Sergey Semyonov (Serge)
5491cb4d99
blitter prerequisite
...
git-svn-id: svn://kolibrios.org@2341 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-02 08:42:35 +00:00
Sergey Semyonov (Serge)
adce55500e
remove deleted cursor from cursor's list
...
git-svn-id: svn://kolibrios.org@2337 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-01-25 03:56:53 +00:00
Artem Jerdev (art_zh)
57c28de885
new font engine
...
git-svn-id: svn://kolibrios.org@2322 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-29 09:40:16 +00:00
Artem Jerdev (art_zh)
9e4294fe02
sysfont parser bugfix
...
git-svn-id: svn://kolibrios.org@2321 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-28 21:26:53 +00:00
Artem Jerdev (art_zh)
7ab46af0a7
sysfont parser
...
git-svn-id: svn://kolibrios.org@2320 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-28 01:09:32 +00:00
Artem Jerdev (art_zh)
c01092c6cf
new font engine
...
git-svn-id: svn://kolibrios.org@2318 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-26 01:25:06 +00:00
Artem Jerdev (art_zh)
e1ef1272a2
vectorized system font #0 (data)
...
git-svn-id: svn://kolibrios.org@2316 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-14 21:37:38 +00:00
hidnplayr
c518777ac6
NET branch: Fixed errors in socket_open and socket_fork
...
git-svn-id: svn://kolibrios.org@2315 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-13 16:17:05 +00:00
hidnplayr
61a835651a
-Fixed build.bat for NET branch
...
-Removed some unrelated files
-updates in telnet
git-svn-id: svn://kolibrios.org@2314 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-13 15:19:27 +00:00
hidnplayr
dfbe402a16
Updated i8255x driver for NET branch
...
git-svn-id: svn://kolibrios.org@2313 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-13 13:29:43 +00:00
hidnplayr
82c4a67737
Added missing struct.inc to NET branch
...
git-svn-id: svn://kolibrios.org@2312 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-13 13:23:38 +00:00
hidnplayr
343d6e80ca
more small updates and fixes in net branch
...
git-svn-id: svn://kolibrios.org@2311 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-12 22:35:01 +00:00
hidnplayr
3ce07b4be0
more small updates and fixes in net branch
...
git-svn-id: svn://kolibrios.org@2310 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-12 20:05:07 +00:00
hidnplayr
29c0d093db
small updates and fixes in TCP for net branch
...
git-svn-id: svn://kolibrios.org@2309 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-12 19:20:33 +00:00
hidnplayr
63bc53c598
small updates and fixes in net branch
...
git-svn-id: svn://kolibrios.org@2308 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-12 15:39:15 +00:00
hidnplayr
df1f1777ac
Re-enabled i8255x card 1068:8086.
...
git-svn-id: svn://kolibrios.org@2307 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-12 14:09:30 +00:00
hidnplayr
dea41c44ce
re-enabled rtl8139 card in trunk kernel, it was disabled by error in r1887
...
git-svn-id: svn://kolibrios.org@2306 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-09 20:03:39 +00:00
hidnplayr
255c2b5ab3
NET branch: re-organised all structs to use struct.inc from fasm
...
git-svn-id: svn://kolibrios.org@2305 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-08 23:06:26 +00:00
hidnplayr
92f2253d7a
Making SIS900 driver for net branch compileable
...
git-svn-id: svn://kolibrios.org@2304 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-08 17:24:46 +00:00
hidnplayr
292477fb7c
More of the same
...
git-svn-id: svn://kolibrios.org@2303 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-07 22:36:05 +00:00
hidnplayr
b2a283b9fe
Removed unnescessary typecasts in net branch
...
git-svn-id: svn://kolibrios.org@2302 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-07 22:08:40 +00:00
hidnplayr
8aee69dafb
Replaced some of the 'magic numbers' in net branch with constants.
...
git-svn-id: svn://kolibrios.org@2301 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-07 21:03:20 +00:00
hidnplayr
b7875fe3bf
Fixed Unsigned jumps in net branch
...
git-svn-id: svn://kolibrios.org@2300 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-07 20:25:47 +00:00
CleverMouse
037099f50d
Style corrected for new rules, no semantic changes
...
git-svn-id: svn://kolibrios.org@2288 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-10-14 21:38:50 +00:00
Sergey Semyonov (Serge)
822829ea70
merge trunk
...
git-svn-id: svn://kolibrios.org@2268 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-10-05 11:14:40 +00:00
Sergey Semyonov (Serge)
1463afc261
reduce kernel memory usage
...
git-svn-id: svn://kolibrios.org@2267 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-10-05 11:13:17 +00:00
Marat Zakiyanov (Mario79)
eade1f9f90
Many fixes for blue boot screen
...
git-svn-id: svn://kolibrios.org@2261 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-10-04 22:00:04 +00:00
Sergey Semyonov (Serge)
31f7c7180c
acpi: reduce kernel memory usage
...
git-svn-id: svn://kolibrios.org@2259 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-10-04 16:03:06 +00:00
killerkirill
02004e9c11
Minor changes to English comments - grammatical, etc.
...
git-svn-id: svn://kolibrios.org@2257 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-10-03 17:52:42 +00:00
Marat Zakiyanov (Mario79)
6ea57786b0
Remove the old VRR code. p.1
...
git-svn-id: svn://kolibrios.org@2255 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-10-03 14:16:25 +00:00
Marat Zakiyanov (Mario79)
6e5e6b3c02
New f.18.1
...
git-svn-id: svn://kolibrios.org@2244 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-27 07:08:12 +00:00
Marat Zakiyanov (Mario79)
132b516d92
alternative fix for r.1474
...
git-svn-id: svn://kolibrios.org@2233 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-23 02:33:18 +00:00
Sergey Semyonov (Serge)
a61cc1cc58
merge apic code
...
git-svn-id: svn://kolibrios.org@2231 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-22 16:44:10 +00:00
Sergey Semyonov (Serge)
7e141ac4d8
acpi: bugfixes
...
git-svn-id: svn://kolibrios.org@2229 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-22 12:21:49 +00:00
hidnplayr
d17706e476
NET branch:
...
- cleanup in stack.inc + re-organisation of device pointers
- i8255x driver stub
- fix in sis900 driver (still untested)
git-svn-id: svn://kolibrios.org@2220 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-22 04:08:56 +00:00
Sergey Semyonov (Serge)
71ef7e28cd
acpi: define IRQ_PIC, IRQ_APIC
...
git-svn-id: svn://kolibrios.org@2219 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-21 13:58:48 +00:00
Sergey Semyonov (Serge)
e06410d094
merge acpi #2217
...
git-svn-id: svn://kolibrios.org@2218 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-21 09:13:47 +00:00
Sergey Semyonov (Serge)
9447e850cf
map_io_mem: set proper region size
...
git-svn-id: svn://kolibrios.org@2217 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-20 21:11:22 +00:00
Marat Zakiyanov (Mario79)
9e5b90e354
window.inc - fix for r.1474
...
git-svn-id: svn://kolibrios.org@2214 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-20 00:07:56 +00:00
Sergey Semyonov (Serge)
f95c868e2f
acpi: read ioapic & local apic bases
...
git-svn-id: svn://kolibrios.org@2212 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-19 18:35:05 +00:00
Sergey Semyonov (Serge)
6bbd71b6f8
acpi: merge trank
...
git-svn-id: svn://kolibrios.org@2209 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-18 20:51:00 +00:00
Marat Zakiyanov (Mario79)
4db1abbe76
I very much hope that this is the last fix for r.2129. This revision makes me cry.
...
git-svn-id: svn://kolibrios.org@2208 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-17 23:08:48 +00:00
Marat Zakiyanov (Mario79)
59fc4ab346
tcp.inc: fix for r2129
...
git-svn-id: svn://kolibrios.org@2186 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-14 16:21:32 +00:00
Marat Zakiyanov (Mario79)
213f39d0cd
CAPS LOCK for ASCII key
...
git-svn-id: svn://kolibrios.org@2171 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-11 17:31:15 +00:00
Sergey Semyonov (Serge)
be59696270
merge kolibri_acpi #2156
...
git-svn-id: svn://kolibrios.org@2167 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-10 10:58:39 +00:00
Sergey Semyonov (Serge)
6252cd9a99
rename IRQ_EOI(irq) -> __fastcall irq_eoi(irq)
...
git-svn-id: svn://kolibrios.org@2166 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-10 10:52:59 +00:00
Sergey Semyonov (Serge)
751664d089
heap: fix memory leakage
...
git-svn-id: svn://kolibrios.org@2164 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-07 21:27:52 +00:00
Sergey Semyonov (Serge)
20a4ca93e3
taskman:fix error reporting
...
git-svn-id: svn://kolibrios.org@2157 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-05 11:23:08 +00:00
Sergey Semyonov (Serge)
37118c3bc0
kernel_heap: hash table for memory descriptors
...
git-svn-id: svn://kolibrios.org@2156 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-05 09:36:30 +00:00
Sergey Semyonov (Serge)
1804fc6d05
merge kolibri-acpi #2151
...
git-svn-id: svn://kolibrios.org@2154 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-04 16:41:24 +00:00
Sergey Semyonov (Serge)
81a07b7206
kernel heap: new allocator for block descriptors
...
git-svn-id: svn://kolibrios.org@2151 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-04 15:59:54 +00:00
Sergey Semyonov (Serge)
d7ea1d9270
merge trunk 2149
...
git-svn-id: svn://kolibrios.org@2150 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-04 09:02:01 +00:00
Sergey Semyonov (Serge)
87882ebc37
v86: fix wrong irq number
...
git-svn-id: svn://kolibrios.org@2149 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-03 08:04:20 +00:00
CleverMouse
eca36f7ef4
socket.inc: fix for r2129
...
git-svn-id: svn://kolibrios.org@2147 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-02 19:48:37 +00:00
CleverMouse
a3388c45de
sync with r2143 except for a typo
...
git-svn-id: svn://kolibrios.org@2146 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-02 19:32:21 +00:00
CleverMouse
a632fb94b0
fix virtual root enumeration broken in r2129
...
git-svn-id: svn://kolibrios.org@2145 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-02 19:03:49 +00:00
Sergey Semyonov (Serge)
1edac8b45a
acpi:rework mutexes
...
git-svn-id: svn://kolibrios.org@2143 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-02 06:58:48 +00:00
Sergey Semyonov (Serge)
3c8db1907e
merge trunk
...
git-svn-id: svn://kolibrios.org@2142 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-01 16:29:55 +00:00
Sergey Semyonov (Serge)
7df91a3195
Kernel: initialize keyboard before mouse
...
git-svn-id: svn://kolibrios.org@2141 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-09-01 06:55:15 +00:00
CleverMouse
57633abf05
support for PnP disks, part 2: adapt current caching
...
git-svn-id: svn://kolibrios.org@2140 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-31 16:26:51 +00:00
Sergey Semyonov (Serge)
2cc416a4d8
kernel heap: minor improvements
...
git-svn-id: svn://kolibrios.org@2138 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-30 20:51:22 +00:00
CleverMouse
c33c39a421
fix mutex_unlock
...
git-svn-id: svn://kolibrios.org@2137 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-30 14:03:36 +00:00
Sergey Semyonov (Serge)
836a2f71bd
merge trunk
...
git-svn-id: svn://kolibrios.org@2130 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-27 11:24:26 +00:00
Sergey Semyonov (Serge)
246c135659
irq: reset fail counter
...
all kernel: replace old non-blocking mutexes
git-svn-id: svn://kolibrios.org@2129 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-27 10:59:48 +00:00
CleverMouse
3ec60d2e42
forgotten include
...
git-svn-id: svn://kolibrios.org@2123 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-26 11:51:56 +00:00
CleverMouse
fa7b5eb6e1
kernel timers
...
git-svn-id: svn://kolibrios.org@2122 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-26 11:46:54 +00:00
CleverMouse
cdeeb6be66
support for PnP disks: add exports and docs
...
git-svn-id: svn://kolibrios.org@2120 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-25 19:58:37 +00:00
CleverMouse
1eb4e63e51
support for PnP disks, part 1
...
git-svn-id: svn://kolibrios.org@2119 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-25 18:32:14 +00:00
Sergey Semyonov (Serge)
0c8c27e46c
move PIC functions into separate file
...
git-svn-id: svn://kolibrios.org@2118 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-25 09:32:01 +00:00
CleverMouse
a722eb5c4d
get sizeof.* really working for struct/ends definitions
...
git-svn-id: svn://kolibrios.org@2115 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-24 13:11:18 +00:00
Sergey Semyonov (Serge)
a7589ea8ee
restore previous version_inf
...
git-svn-id: svn://kolibrios.org@2114 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-24 11:25:47 +00:00
Sergey Semyonov (Serge)
0d01bde3f5
missing irq.inc
...
git-svn-id: svn://kolibrios.org@2113 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-24 11:03:45 +00:00
Sergey Semyonov (Serge)
000b6ce1cb
shared irq's
...
git-svn-id: svn://kolibrios.org@2112 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-24 11:01:37 +00:00
Sergey Semyonov (Serge)
e711a754bc
move irq functions into separate file
...
git-svn-id: svn://kolibrios.org@2106 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-23 12:25:29 +00:00
maximYCH
7f63a7e064
Russian language for kernel boot messages
...
git-svn-id: svn://kolibrios.org@2104 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-23 07:32:13 +00:00
Marat Zakiyanov (Mario79)
b3bbdbcdf1
Correct for r2101 "force behaviour as before r1992"
...
git-svn-id: svn://kolibrios.org@2103 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-22 17:10:02 +00:00
CleverMouse
1b390fd667
force behaviour as before r1989, r1992
...
git-svn-id: svn://kolibrios.org@2101 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-22 15:39:22 +00:00
Sergey Semyonov (Serge)
5a5c11b26d
remove unused code
...
git-svn-id: svn://kolibrios.org@2100 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-22 09:49:26 +00:00
Sergey Semyonov (Serge)
5ece1eb408
update documentation
...
git-svn-id: svn://kolibrios.org@2090 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-21 12:31:48 +00:00
Sergey Semyonov (Serge)
b3a861cedd
remove fn 41,42,44,45
...
git-svn-id: svn://kolibrios.org@2089 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-21 12:26:22 +00:00
Marat Zakiyanov (Mario79)
fe72383413
Fix for Floppy/IRQ6 - broken from r.1380
...
git-svn-id: svn://kolibrios.org@2084 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-20 15:18:25 +00:00
Sergey Semyonov (Serge)
4e1ac7b0d6
new irq handling
...
git-svn-id: svn://kolibrios.org@2050 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-16 11:34:07 +00:00
Sergey Semyonov (Serge)
416dc8b600
IRQH code
...
git-svn-id: svn://kolibrios.org@2049 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-15 20:34:55 +00:00
Artem Jerdev (art_zh)
2a927db105
direct detection of available memory
...
git-svn-id: svn://kolibrios.org@2047 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-14 09:08:02 +00:00
Mihail Semenyako (mike.dld)
74263ea13b
fs_HdDelete:
...
* correct check for ext2 partition type (never reached ext2 implementation)
reserve_cd_channel:
* jump to correct label (wrong channel was being reserved if retry occured)
* re-enable interrupts (were being masked upon proc return)
git-svn-id: svn://kolibrios.org@2044 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-08-10 19:21:44 +00:00
Sergey Semyonov (Serge)
d75c968b8e
fix pci irq's
...
git-svn-id: svn://kolibrios.org@2015 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-07-24 07:26:00 +00:00