Merge branch 'frameless_w_fixed_header-div'
authorSven Donath <lxo@dexo.de>
Thu, 18 Oct 2012 15:17:12 +0000 (17:17 +0200)
committerSven Donath <lxo@dexo.de>
Thu, 18 Oct 2012 15:17:12 +0000 (17:17 +0200)

Trivial merge