Merge commit 'origin/bug_175_wlan_connection_problem' into experimental
authorAcid Burn <acid-burn@ACIDNET.(none)>
Mon, 9 Nov 2009 16:58:03 +0000 (17:58 +0100)
committerAcid Burn <acid-burn@ACIDNET.(none)>
Mon, 9 Nov 2009 16:58:03 +0000 (17:58 +0100)

Trivial merge