Merge remote branch 'origin/patch-4404'
authorIan Lynagh <igloo@earth.li>
Thu, 7 Apr 2011 18:40:06 +0000 (19:40 +0100)
committerIan Lynagh <igloo@earth.li>
Thu, 7 Apr 2011 18:40:06 +0000 (19:40 +0100)

Trivial merge