Merge branch 'develop'
authorFrank Lahm <franklahm@googlemail.com>
Fri, 28 Sep 2012 09:25:57 +0000 (11:25 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Fri, 28 Sep 2012 09:25:57 +0000 (11:25 +0200)

Trivial merge