Merge remote-tracking branch 'origin/development'
authorpk910 <philipp@zoelle1.de>
Tue, 11 Sep 2012 19:24:10 +0000 (21:24 +0200)
committerpk910 <philipp@zoelle1.de>
Tue, 11 Sep 2012 19:24:10 +0000 (21:24 +0200)

Trivial merge