Merge branch 'gpg-agent'
authorStef Walter <stef@memberwebs.com>
Mon, 28 Jun 2010 14:28:36 +0000 (14:28 +0000)
committerStef Walter <stef@memberwebs.com>
Mon, 28 Jun 2010 14:28:36 +0000 (14:28 +0000)

Trivial merge