Merge branch 'master' into experimental
authorStefan Pluecken <stefan.pluecken@multimedia-labs.de>
Wed, 4 Nov 2009 15:41:12 +0000 (16:41 +0100)
committerStefan Pluecken <stefan.pluecken@multimedia-labs.de>
Wed, 4 Nov 2009 15:41:12 +0000 (16:41 +0100)
Conflicts:
lib/python/Plugins/Extensions/MediaPlayer/plugin.py


No differences found