Merge branch 'master' into tmp
authorIan Lynagh <igloo@earth.li>
Sun, 18 Sep 2011 14:52:25 +0000 (15:52 +0100)
committerIan Lynagh <igloo@earth.li>
Sun, 18 Sep 2011 14:52:25 +0000 (15:52 +0100)

Trivial merge