Merged upstream changes.
authorVinay Sajip <vinay_sajip@yahoo.co.uk>
Thu, 23 Feb 2012 20:53:40 +0000 (20:53 +0000)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>
Thu, 23 Feb 2012 20:53:40 +0000 (20:53 +0000)

Trivial merge