Merge remote branch 'origin/acid-burn/bug_670_plugin_restartoption' into experimental
authoracid-burn <acid-burn@opendreambox.org>
Fri, 18 Feb 2011 19:31:01 +0000 (20:31 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Fri, 18 Feb 2011 19:31:01 +0000 (20:31 +0100)

Trivial merge