Merge remote branch 'tove/master'
authorJoey Hess <joey@gnu.kitenet.net>
Sat, 2 Jan 2010 20:11:51 +0000 (15:11 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Sat, 2 Jan 2010 20:11:51 +0000 (15:11 -0500)

Trivial merge