hidnplayr
a34e3e8e18
Bugfixes and refactoring of FTPd (net branch)
...
git-svn-id: svn://kolibrios.org@2602 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-12 09:58:58 +00:00
hidnplayr
cb6e8e3fb9
Fixed bug in TCP.
...
Error occured when receiving a TCP segment wich has no local socket. (netbranch)
git-svn-id: svn://kolibrios.org@2600 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-11 13:07:45 +00:00
hidnplayr
5dd08c56bf
Updates and bugfixes for FTPd (net branch)
...
git-svn-id: svn://kolibrios.org@2598 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-10 19:44:51 +00:00
hidnplayr
70caf20c58
Some cosmetic changes in FTPd (net branch)
...
git-svn-id: svn://kolibrios.org@2585 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-07 18:42:58 +00:00
hidnplayr
e22890bbd0
Fixed PORT command (active mode) for FTPd (net branch)
...
git-svn-id: svn://kolibrios.org@2581 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-07 11:36:00 +00:00
hidnplayr
0d44338d5d
Added multithread-capabilities to FTPd (net branch)
...
git-svn-id: svn://kolibrios.org@2578 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-06 18:37:00 +00:00
hidnplayr
d0105fc6d5
Changes in net branch:
...
Fixed bug in socket_ring_write concerning very big numbers.
Socket_send now returns number of sent bytes.
git-svn-id: svn://kolibrios.org@2573 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-05 16:23:47 +00:00
hidnplayr
a268aaffd6
Changed SOCKET_accept to bind the new socket to the active thread. (net branch)
...
git-svn-id: svn://kolibrios.org@2572 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-05 13:52:26 +00:00
hidnplayr
843b584cd7
Added RETR command to FTP daemon (net branch)
...
Also fixed some bugs and added CDUP (untested)
git-svn-id: svn://kolibrios.org@2571 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-05 13:00:39 +00:00
hidnplayr
d277a579f2
Added CWD command to FTP daemon (net branch)
...
git-svn-id: svn://kolibrios.org@2563 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-04 17:19:00 +00:00
hidnplayr
0833e5c02d
Implemented Passive mode and LIST command in new FTP daemon (net branch)
...
git-svn-id: svn://kolibrios.org@2562 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-04 13:08:07 +00:00
hidnplayr
742df45545
Added some more commands to the new FTP Daemon (net branch)
...
git-svn-id: svn://kolibrios.org@2560 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-04 09:24:08 +00:00
hidnplayr
a3b3514e59
Further development of the new FTP daemon (net branch)
...
git-svn-id: svn://kolibrios.org@2557 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-03 20:28:26 +00:00
hidnplayr
c552138150
Better text printing for TCPserv (net branch)
...
git-svn-id: svn://kolibrios.org@2556 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-03 18:35:40 +00:00
hidnplayr
a1174dce46
Fixed bug in TCP_input.listen, clarified some of the debug output (net branch)
...
git-svn-id: svn://kolibrios.org@2555 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-03 18:26:53 +00:00
hidnplayr
07aba6c98f
added FTP daemon stub (net branch)
...
git-svn-id: svn://kolibrios.org@2554 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-03 16:37:24 +00:00
hidnplayr
b326834b2e
Bugfix for ICMP sockets in net branch
...
git-svn-id: svn://kolibrios.org@2553 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-03 16:34:37 +00:00
hidnplayr
f10b7bd3bc
Fixed bug in some network drivers. (net branch)
...
git-svn-id: svn://kolibrios.org@2544 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-02 18:49:13 +00:00
hidnplayr
087ba52a9f
Bugfix in telnet when connection cannot be made (net branch)
...
git-svn-id: svn://kolibrios.org@2543 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-02 17:11:33 +00:00
hidnplayr
a4e79969dd
Bugfix for Telnet and tcp socket close in net branch
...
git-svn-id: svn://kolibrios.org@2541 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-02 16:18:12 +00:00
hidnplayr
dd88d5bff6
Sync net branch with trunk
...
git-svn-id: svn://kolibrios.org@2540 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-02 15:18:46 +00:00
hidnplayr
f28853c51d
Fixed Telnet for net branch.
...
Not the most elegant sollution but at least it works now!
git-svn-id: svn://kolibrios.org@2539 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-02 12:06:31 +00:00
Artem Jerdev (art_zh)
626b1133c8
New sysfont #2 added
...
git-svn-id: svn://kolibrios.org@2522 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-28 23:12:25 +00:00
Artem Jerdev (art_zh)
3017a820d3
NSV-fonts: tickfields renumerated
...
git-svn-id: svn://kolibrios.org@2499 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-23 01:10:27 +00:00
Artem Jerdev (art_zh)
ce9ffe8571
Nonscalable Vectorized Fonts: the Parser!
...
git-svn-id: svn://kolibrios.org@2470 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-15 23:11:54 +00:00
Sergey Semyonov (Serge)
357566b767
acpi: new clipping code
...
git-svn-id: svn://kolibrios.org@2467 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-15 15:34:46 +00:00
Sergey Semyonov (Serge)
c3da687125
acpi: merge trunk
...
git-svn-id: svn://kolibrios.org@2465 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-15 12:41:29 +00:00
Artem Jerdev (art_zh)
30883bfc24
New font engine in progress
...
git-svn-id: svn://kolibrios.org@2461 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-15 01:02:08 +00:00
Sergey Semyonov (Serge)
3340831e5e
acpi:print e820 memory map
...
git-svn-id: svn://kolibrios.org@2442 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-09 12:55:55 +00:00
Sergey Semyonov (Serge)
6dcd9aa69b
acpi:print cpu count
...
git-svn-id: svn://kolibrios.org@2441 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-09 11:35:26 +00:00
Sergey Semyonov (Serge)
3e6513d51d
enumerate CPU's and start AP.
...
git-svn-id: svn://kolibrios.org@2439 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-09 08:20:02 +00:00
Sergey Semyonov (Serge)
1fca7a07cb
Can we start AP, please ?
...
git-svn-id: svn://kolibrios.org@2437 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-08 15:49:27 +00:00
Sergey Semyonov (Serge)
c856b49825
merge trunk
...
git-svn-id: svn://kolibrios.org@2434 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-08 08:33:38 +00:00
Artem Jerdev (art_zh)
c1e1e0ac8a
system starts faster (minus 250 milliseconds)
...
git-svn-id: svn://kolibrios.org@2425 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-03-01 01:22:24 +00:00
hidnplayr
946e05cb81
Fixed socket_ring_write in net branch.
...
git-svn-id: svn://kolibrios.org@2404 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-25 13:02:09 +00:00
hidnplayr
4aee41218a
Forgot init_mutex ...
...
git-svn-id: svn://kolibrios.org@2403 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-25 12:07:41 +00:00
hidnplayr
815cb2a26f
Usage of new mutexes in net branch.
...
git-svn-id: svn://kolibrios.org@2402 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-25 12:03:22 +00:00
hidnplayr
0478f45357
Bugfix in PCnet32 driver for net branch
...
git-svn-id: svn://kolibrios.org@2401 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-24 22:04:04 +00:00
hidnplayr
85c176d7f5
Fixed TCP and UDP checksum in net branch.
...
git-svn-id: svn://kolibrios.org@2390 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-23 22:21:40 +00:00
hidnplayr
997d83d275
Added error reporting to some of the network drivers in net branch
...
git-svn-id: svn://kolibrios.org@2387 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-23 21:18:16 +00:00
hidnplayr
d0e0776223
Fixed ICMP in net branch
...
git-svn-id: svn://kolibrios.org@2386 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-23 20:35:40 +00:00
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
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
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
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
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
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
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
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)
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
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)
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
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
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)
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)
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)
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
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
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)
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
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
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
Artem Jerdev (art_zh)
e338e5353f
getting smaller and closer to real hardware...
...
git-svn-id: svn://kolibrios.org@2014 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-07-23 15:27:18 +00:00
Sergey Semyonov (Serge)
f59df34e17
merge trunk
...
git-svn-id: svn://kolibrios.org@2010 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-07-22 18:08:47 +00:00
CleverMouse
08246cd957
merge kolibri-cfg into trunk
...
git-svn-id: svn://kolibrios.org@1962 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-06-16 17:09:40 +00:00
Artem Jerdev (art_zh)
a3746b98d0
stable corebootable version
...
git-svn-id: svn://kolibrios.org@1952 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-06-12 17:56:51 +00:00
CleverMouse
b0b34108f2
kolibri-cfg: fixes in fat32 bootloader
...
git-svn-id: svn://kolibrios.org@1950 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-06-08 18:43:41 +00:00
CleverMouse
7b2b309d03
kernel branch with configurable boot
...
git-svn-id: svn://kolibrios.org@1942 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-05-30 10:27:45 +00:00
Artem Jerdev (art_zh)
96673e3ce5
kernel constants compression/relocation
...
git-svn-id: svn://kolibrios.org@1941 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-05-30 10:11:03 +00:00
Artem Jerdev (art_zh)
e37372cd01
bootloader optimization
...
git-svn-id: svn://kolibrios.org@1940 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-05-28 07:32:24 +00:00
Artem Jerdev (art_zh)
83c504b87c
just a minor optimisation
...
git-svn-id: svn://kolibrios.org@1930 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-05-13 13:11:10 +00:00
Artem Jerdev (art_zh)
883ade9e49
gfx-revertion bugs liced
...
git-svn-id: svn://kolibrios.org@1929 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-05-12 23:22:18 +00:00