Merge remote branch 'origin/master'
authorSven Donath <lxo@dexo.de>
Mon, 12 Nov 2012 19:11:18 +0000 (20:11 +0100)
committerSven Donath <lxo@dexo.de>
Mon, 12 Nov 2012 19:11:18 +0000 (20:11 +0100)

Trivial merge