Merge branch 'master' into plasma/declarative

Authored by mart on Mar 5 2011, 5:40 PM.