Merge branch 'master' into commentreorg
authorJoey Hess <joey@kitenet.net>
Fri, 7 May 2010 17:25:56 +0000 (13:25 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 7 May 2010 17:25:56 +0000 (13:25 -0400)

Trivial merge