Merge branch 'html_menu'
authorSven Donath <lxo@dexo.de>
Tue, 5 Oct 2010 20:23:58 +0000 (22:23 +0200)
committerSven Donath <lxo@dexo.de>
Tue, 5 Oct 2010 20:23:58 +0000 (22:23 +0200)

Trivial merge