Merge branch 'master' of win:c:/m64/head/.
authorIan Lynagh <igloo@earth.li>
Fri, 16 Mar 2012 23:30:43 +0000 (23:30 +0000)
committerIan Lynagh <igloo@earth.li>
Fri, 16 Mar 2012 23:30:43 +0000 (23:30 +0000)

Trivial merge