Git commit 4494ad49cd5c2a7abacea504493486065d540e6e by Christoph Feck.
Committed on 28/02/2011 at 23:31.
Pushed by cfeck into branch 'master'.

Merge branch 'master' of git://anongit.kde.org/phonon

I  +3    -5    demos/simplecapture/capture.cpp     
I  +8    -5    demos/simpleplayer/main.cpp     
I  +20   -18   demos/simpleplayer/player.cpp     
I  +8    -8    demos/simpleplayer/player.h     
I  +41   -20   phonon/mediasource.cpp     
I  +20   -0    phonon/mediasource.h     

http://commits.kde.org/phonon/4494ad49cd5c2a7abacea504493486065d540e6e