Merge branch 'master' into trust-store
authorStef Walter <stefw@collabora.co.uk>
Mon, 6 Dec 2010 21:00:30 +0000 (21:00 +0000)
committerStef Walter <stefw@collabora.co.uk>
Mon, 6 Dec 2010 21:00:30 +0000 (21:00 +0000)

Trivial merge