Merge branch 'linksbrowser_menu'
authorSven Donath <lxo@dexo.de>
Tue, 28 Sep 2010 14:46:42 +0000 (16:46 +0200)
committerSven Donath <lxo@dexo.de>
Tue, 28 Sep 2010 14:46:42 +0000 (16:46 +0200)

Trivial merge