Merge branch 'maint'
authorAchim Gratz <Stromeko@Stromeko.DE>
Wed, 7 Nov 2012 17:45:25 +0000 (18:45 +0100)
committerAchim Gratz <Stromeko@Stromeko.DE>
Wed, 7 Nov 2012 17:45:25 +0000 (18:45 +0100)

Trivial merge