Merge remote branch 'sf/develop' into develop
authorFrank Lahm <franklahm@googlemail.com>
Fri, 28 Sep 2012 09:24:07 +0000 (11:24 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Fri, 28 Sep 2012 09:24:07 +0000 (11:24 +0200)

Trivial merge