Merge branch 'master' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Sat, 11 Dec 2010 11:20:36 +0000 (12:20 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Sat, 11 Dec 2010 11:20:36 +0000 (12:20 +0100)
1  2 
lib/gui/elistboxcontent.cpp

Simple merge