Merge commit 'intrigeri/po'
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 28 Aug 2009 11:40:46 +0000 (07:40 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 28 Aug 2009 11:40:46 +0000 (07:40 -0400)

Trivial merge