Merge commit 'origin/bug_203_fix_wrong_networkstate' into experimental
authoracid-burn <[email protected]>
Thu, 17 Dec 2009 11:11:35 +0000 (12:11 +0100)
committeracid-burn <[email protected]>
Thu, 17 Dec 2009 11:11:35 +0000 (12:11 +0100)

Trivial merge