Merge branch 'master' into po
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 29 Mar 2009 18:31:40 +0000 (14:31 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 29 Mar 2009 18:31:40 +0000 (14:31 -0400)

Trivial merge