Merge branch 'bug_204_wlan_automatic_scanning'
authoracid-burn <acid-burn@opendreambox.org>
Wed, 23 Dec 2009 05:58:36 +0000 (06:58 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Wed, 23 Dec 2009 05:58:36 +0000 (06:58 +0100)

Trivial merge