Merged upstream changes.
authorVinay Sajip <vinay_sajip@yahoo.co.uk>
Thu, 23 Feb 2012 20:55:58 +0000 (20:55 +0000)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>
Thu, 23 Feb 2012 20:55:58 +0000 (20:55 +0000)
commit93fa159a43cd05c183e54a2d8f4a5a794d254512
tree7b8410e4b0a549d63536b12c3556688266ed9932
parent501982226a175a9e7eeaee597e25ee6319815b7e
parent03d23687480c77130e7fc28f323ec75413e6f060
MergedĀ upstreamĀ changes.