Merge remote branch 'memphiz/win32'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Tue, 13 Sep 2011 05:10:45 +0000 (15:10 +1000)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Tue, 13 Sep 2011 05:10:45 +0000 (15:10 +1000)

Trivial merge