Merge remote branch 'origin/obi/bug_726_interfaces' into acid-burn/networking_changes
authoracid-burn <acid-burn@opendreambox.org>
Tue, 15 Mar 2011 12:09:15 +0000 (13:09 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Tue, 15 Mar 2011 12:09:15 +0000 (13:09 +0100)

Trivial merge