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

Trivial merge