Merge branch 'secret-content-type'
authorStef Walter <stefw@collabora.co.uk>
Tue, 1 Mar 2011 09:27:42 +0000 (10:27 +0100)
committerStef Walter <stefw@collabora.co.uk>
Tue, 1 Mar 2011 09:27:42 +0000 (10:27 +0100)

Trivial merge