Merge commit 'c859d17f9b0ae8559dac4f7e5cb8521e7ab5f0fb'
authorIan Lynagh <igloo@earth.li>
Wed, 25 Jul 2012 14:27:43 +0000 (15:27 +0100)
committerIan Lynagh <igloo@earth.li>
Wed, 25 Jul 2012 14:27:43 +0000 (15:27 +0100)

Trivial merge