Merge branch 'master' of github.com:bagder/curl
authormonnerat <pm@datasphere.ch>
Mon, 19 Apr 2010 15:37:51 +0000 (17:37 +0200)
committermonnerat <pm@datasphere.ch>
Mon, 19 Apr 2010 15:37:51 +0000 (17:37 +0200)

Trivial merge