Merge branch 'master' of github.com:mono/mono
authorMartin Baulig <martin.baulig@googlemail.com>
Sat, 2 Jun 2012 15:44:58 +0000 (17:44 +0200)
committerMartin Baulig <martin.baulig@googlemail.com>
Sat, 2 Jun 2012 15:44:58 +0000 (17:44 +0200)

Trivial merge