commit fa4df8ca8f4924e8ffa5240e1eaf728876c5efe5 Author: Marco Martin Date: Wed Jan 30 13:43:33 2013 +0100 subtree merge of kdelibs/plasma into plasma