Merge branch 'gnupg-process'
authorStef Walter <stefw@collabora.co.uk>
Tue, 12 Jul 2011 10:55:57 +0000 (12:55 +0200)
committerStef Walter <stefw@collabora.co.uk>
Tue, 12 Jul 2011 10:55:57 +0000 (12:55 +0200)

Trivial merge