Merge branch 'master' of github.com:bagder/curl
authorPierre Joye <pierre.php@gmail.com>
Thu, 26 Jan 2012 15:39:53 +0000 (16:39 +0100)
committerPierre Joye <pierre.php@gmail.com>
Thu, 26 Jan 2012 15:39:53 +0000 (16:39 +0100)

Trivial merge