Merge branch 'master' into plasma/declarative

Authored by sebas on Apr 4 2011, 1:50 PM.

Description

Merge branch 'master' into plasma/declarative

Empty Commit

This commit is empty and does not affect any paths.