Merge remote branch 'origin/acid-burn/bug_670_plugin_restartoption'
authoracid-burn <acid-burn@opendreambox.org>
Thu, 17 Feb 2011 11:03:29 +0000 (12:03 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Thu, 17 Feb 2011 11:03:29 +0000 (12:03 +0100)

Trivial merge