Merge commit 'dm/experimental' into test branch
authorschon <schon@dev03-server>
Wed, 25 May 2011 07:26:17 +0000 (16:26 +0900)
committerschon <schon@dev03-server>
Wed, 25 May 2011 07:26:17 +0000 (16:26 +0900)
commitb72c9852440926ac82fd4ca3186278edd7167427
tree3a6408cf4950b1e43ac30d6922864a58e3d4392e
parente9f6e4e8facac1243a8bbc93c704e4f2d1a28cc7
parent74e73fc17f163be508f19fc68ecce835be0177b9
Merge commit 'dm/experimental' into test branch

Conflicts:
lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
lib/python/Screens/NetworkSetup.py
lib/python/Plugins/SystemPlugins/SoftwareManager/SoftwareTools.py
lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
lib/python/Screens/AudioSelection.py
lib/python/Screens/NetworkSetup.py