Merge remote branch 'origin/acid-burn/bug_670_plugin_restartoption'
authoracid-burn <acid-burn@opendreambox.org>
Tue, 22 Feb 2011 19:54:54 +0000 (20:54 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Tue, 22 Feb 2011 19:54:54 +0000 (20:54 +0100)

Trivial merge