The following commit has been merged in the master branch:
commit 7cdedeeb24cbee1a06671e1f616be65f9e3e23b5
Merge: 7a8c3f7fb08aa00cf128fe69d22353ad79e6c975 3c86314e8987f2599d848f349dd67c697d1566a6
Author: Dominic Hargreaves <dom at earth.li>
Date: Sun Aug 21 11:36:01 2011 +0100
Merge commit 'upstream/0.44'
--