Merge commit 'dm/experimental' into test_0108
authorschon <schon@dev03-server>
Sat, 8 Jan 2011 06:45:37 +0000 (15:45 +0900)
committerschon <schon@dev03-server>
Sat, 8 Jan 2011 06:45:37 +0000 (15:45 +0900)
1  2 
RecordTimer.py
configure.ac
lib/python/Components/Harddisk.py
lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
lib/python/Screens/AudioSelection.py
lib/service/servicedvb.cpp

diff --cc RecordTimer.py
Simple merge
diff --cc configure.ac
Simple merge
Simple merge
Simple merge
Simple merge