Merge remote branch 'origin/master'
authorSven Donath <lxo@dexo.de>
Thu, 18 Oct 2012 15:16:34 +0000 (17:16 +0200)
committerSven Donath <lxo@dexo.de>
Thu, 18 Oct 2012 15:16:34 +0000 (17:16 +0200)

Trivial merge