Merge branch 'master' into gpg-agent
authorStef Walter <stef@memberwebs.com>
Sat, 12 Jun 2010 22:39:09 +0000 (22:39 +0000)
committerStef Walter <stef@memberwebs.com>
Sat, 12 Jun 2010 22:39:09 +0000 (22:39 +0000)

Trivial merge