Merge branch 'master' of github.com:bagder/curl
authorBill Hoffman <bill.hoffman@kitware.com>
Thu, 25 Mar 2010 03:49:26 +0000 (23:49 -0400)
committerBill Hoffman <bill.hoffman@kitware.com>
Thu, 25 Mar 2010 03:49:26 +0000 (23:49 -0400)

Trivial merge