Merge branch 'develop'
authorAndreas Eversberg <jolly@eversberg.eu>
Wed, 4 Aug 2010 13:13:14 +0000 (15:13 +0200)
committerAndreas Eversberg <jolly@eversberg.eu>
Wed, 4 Aug 2010 13:13:14 +0000 (15:13 +0200)

Trivial merge