Merge branch 'acid-burn/networking_changes'
authoracid-burn <acid-burn@opendreambox.org>
Wed, 16 Mar 2011 15:13:20 +0000 (16:13 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Wed, 16 Mar 2011 15:13:20 +0000 (16:13 +0100)

Trivial merge