Merge branch 'WirelessLanSetup' into vuplus_experimental
authorChang.H.S <jhs@dev3>
Fri, 20 May 2011 04:05:35 +0000 (13:05 +0900)
committerChang.H.S <jhs@dev3>
Fri, 20 May 2011 04:05:35 +0000 (13:05 +0900)
commit36cca1d3f31265929ef3443999ab7fd242b4dae5
treedb961f77a6cce710e514427b170e20d0f7c689a5
parente9f6e4e8facac1243a8bbc93c704e4f2d1a28cc7
parent6f17b15ba19d4aee7e72279593933f8de8f356b4
Merge branch 'WirelessLanSetup' into vuplus_experimental

Conflicts:
configure.ac
lib/python/Plugins/SystemPlugins/Makefile.am
configure.ac
lib/python/Plugins/SystemPlugins/Makefile.am