tree f09e5af1f39d1c306dce06d5a94d653e00a95914
parent 3d212e6ee5fc6efbac818dee92baad1773e9c3c2
parent da4277a739bab61e79dc4d064b1e1648ddd59150
author Vinay Sajip <vinay_sajip@yahoo.co.uk> 1346246827 +0100
committer Vinay Sajip <vinay_sajip@yahoo.co.uk> 1346246827 +0100

Merged upstream changes.