Commit acbefb3cf0b5c3aa8d7d58883e4b5155567a8204
authorMichel Pollet <buserror+git@gmail.com>
Sun, 2 Dec 2012 17:09:44 +0000 (09:09 -0800)
committerMichel Pollet <buserror+git@gmail.com>
Sun, 2 Dec 2012 17:09:44 +0000 (09:09 -0800)
MinGW merge, thanks!


Trivial merge