Merge branch 'master' of win:c:/m64/reg4/.
authorIan Lynagh <igloo@earth.li>
Sat, 24 Mar 2012 02:13:37 +0000 (02:13 +0000)
committerIan Lynagh <igloo@earth.li>
Sat, 24 Mar 2012 02:13:37 +0000 (02:13 +0000)

Trivial merge