Merge remote-tracking branch 'intrigeri/po-long-language-codes'
authorJoey Hess <joey@kitenet.net>
Fri, 3 Jun 2011 16:32:37 +0000 (12:32 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 3 Jun 2011 16:32:37 +0000 (12:32 -0400)

Trivial merge