Merge branch 'sgen-windows'
authorMark Probst <mark.probst@gmail.com>
Tue, 4 Oct 2011 21:19:49 +0000 (23:19 +0200)
committerMark Probst <mark.probst@gmail.com>
Tue, 4 Oct 2011 21:19:49 +0000 (23:19 +0200)

Trivial merge