Merge branch 'maint'
authorAndre Noll <maan@systemlinux.org>
Sat, 19 Dec 2009 12:15:39 +0000 (13:15 +0100)
committerAndre Noll <maan@systemlinux.org>
Sat, 19 Dec 2009 12:15:39 +0000 (13:15 +0100)
commitf113a41a633c0541f0d8418baf40205f4553c885
treec3b53f4410e34b56f1f9016ec45715f217d3a89f
parentba20c3fc5022b456e40acec90591e143a0c8c089
parent4fa9ba989b0f95e7d49a725e07ff5b4a91015700
Merge branch 'maint'

Conflicts:
osx_write.c
http_send.c
osx_write.c