Merge commit 'origin/bug_112_enable_extensions_manager' into experimental
authoracid-burn <acid-burn@opendreambox.org>
Thu, 31 Dec 2009 07:32:42 +0000 (08:32 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Thu, 31 Dec 2009 07:32:42 +0000 (08:32 +0100)

Trivial merge