fix merge conflict.
authoracid-burn <acid-burn@opendreambox.org>
Tue, 15 Dec 2009 18:33:32 +0000 (19:33 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Tue, 15 Dec 2009 18:33:32 +0000 (19:33 +0100)
commit1eb03ca87ad5537ec41506a84f32c90774a66f1b
treed19b47e1e7a2ddd14ac4c81bc771a2cd85f3b909
parentdefadb893d6897935165b63a9de09b95f43dfcc1
fix merge conflict.
lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py