Merge remote-tracking branch 'origin/development'
authorpk910 <philipp@zoelle1.de>
Sat, 22 Sep 2012 05:46:05 +0000 (07:46 +0200)
committerpk910 <philipp@zoelle1.de>
Sat, 22 Sep 2012 05:46:05 +0000 (07:46 +0200)

Trivial merge