Merge branch 'release-3-0-1'
authorFrank Lahm <franklahm@googlemail.com>
Fri, 28 Sep 2012 09:16:56 +0000 (11:16 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Fri, 28 Sep 2012 09:16:56 +0000 (11:16 +0200)

Trivial merge