Merge commit 'jonas/master'
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 22 Jul 2009 22:37:22 +0000 (00:37 +0200)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 22 Jul 2009 22:37:22 +0000 (00:37 +0200)

Trivial merge