Merge remote branch 'origin/master'
authorSven Donath <lxo@dexo.de>
Thu, 22 Nov 2012 15:44:00 +0000 (16:44 +0100)
committerSven Donath <lxo@dexo.de>
Thu, 22 Nov 2012 15:44:00 +0000 (16:44 +0100)

Trivial merge