Merge remote branch 'origin/acid-burn/networking_changes' into experimental
authoracid-burn <acid-burn@opendreambox.org>
Wed, 16 Mar 2011 08:48:48 +0000 (09:48 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Wed, 16 Mar 2011 08:48:48 +0000 (09:48 +0100)

Trivial merge