Merge branch 'bug_539_add_multicontent_pixmap_progress'
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 6 Oct 2010 10:03:24 +0000 (12:03 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 6 Oct 2010 10:03:24 +0000 (12:03 +0200)
1  2 
lib/gui/elistboxcontent.cpp

Simple merge