Merge branch 'development' v5.5
authorpk910 <philipp@zoelle1.de>
Thu, 6 Sep 2012 12:17:49 +0000 (14:17 +0200)
committerpk910 <philipp@zoelle1.de>
Thu, 6 Sep 2012 12:17:49 +0000 (14:17 +0200)

Trivial merge