Merge branch 'master' of win:c:/m64/reg13/.
authorIan Lynagh <igloo@earth.li>
Fri, 18 May 2012 16:55:30 +0000 (17:55 +0100)
committerIan Lynagh <igloo@earth.li>
Fri, 18 May 2012 16:55:30 +0000 (17:55 +0100)

Trivial merge