Angus, why don't you just commit the patch to the head? People will complain for a few days but Herbert has proven that committing things to the head can speed up development significantly. And I remember you wanted to release 1.2.0 soon... :-)
Michael
