Merge commit 'origin/bug_609_packetmanager_fixes' into experimental
authoracid-burn <acid-burn@opendreambox.org>
Mon, 1 Nov 2010 08:08:16 +0000 (09:08 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Mon, 1 Nov 2010 08:08:16 +0000 (09:08 +0100)

Trivial merge