Merge remote-tracking branch 'origin/development'
authorpk910 <philipp@zoelle1.de>
Sun, 9 Sep 2012 10:26:09 +0000 (12:26 +0200)
committerpk910 <philipp@zoelle1.de>
Sun, 9 Sep 2012 10:26:09 +0000 (12:26 +0200)

Trivial merge