Merge commit 'origin/bug_418_network_interfacenaming'
authoracid-burn <acid-burn@opendreambox.org>
Tue, 5 Oct 2010 07:57:00 +0000 (09:57 +0200)
committeracid-burn <acid-burn@opendreambox.org>
Tue, 5 Oct 2010 07:57:00 +0000 (09:57 +0200)

Trivial merge