Merge remote branch 'origin/master'
authorJoey Hess <joey@kitenet.net>
Sat, 8 May 2010 23:44:40 +0000 (19:44 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 8 May 2010 23:44:40 +0000 (19:44 -0400)

Trivial merge