merge
authorJoey Hess <joey@gnu.kitenet.net>
Sat, 12 Dec 2009 20:50:32 +0000 (15:50 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Sat, 12 Dec 2009 20:50:32 +0000 (15:50 -0500)

Trivial merge