Merge commit 'intrigeri/po'
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 27 Aug 2009 19:51:55 +0000 (15:51 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 27 Aug 2009 19:51:55 +0000 (15:51 -0400)

Trivial merge