Merge remote branch 'origin/acid-burn/network_changes_next' into experimental
authorMladen Horvat <acid-burn@opendreambox.org>
Thu, 14 Apr 2011 23:06:22 +0000 (01:06 +0200)
committerMladen Horvat <acid-burn@opendreambox.org>
Thu, 14 Apr 2011 23:06:22 +0000 (01:06 +0200)

Trivial merge