WirelessLan/plugin.py: fix merge conflict
[enigma2.git] / NavigationInstance.py
2005-05-16 Felix Domke - add missing files