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)
commit5c3eb71d77a7c37ef29abaf9a578545d25171e41
treeee8b5c8276ee36f5f376c86274f3097b3ae34d64
parent057f9b4f5534a302c6e66431894724ae213985b1
parenta0542da4384ee0e1589bd7b6ebc9211cdd239205
Merge remote branch 'origin/obi/bug_726_interfaces' into acid-burn/networking_changes