Merge remote branch 'origin/acid-burn/network_changes_next'
authoracid-burn <acid-burn@opendreambox.org>
Mon, 9 May 2011 09:07:49 +0000 (11:07 +0200)
committeracid-burn <acid-burn@opendreambox.org>
Mon, 9 May 2011 09:07:49 +0000 (11:07 +0200)

Trivial merge