Merge branch 'master' into 0.11
authorMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Thu, 22 Mar 2012 17:23:22 +0000 (18:23 +0100)
committerMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Thu, 22 Mar 2012 17:23:22 +0000 (18:23 +0100)

Trivial merge