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)
commitc68413dccecfb303f8cfc803672bf132af025968
tree2e984a64088691fba6141080cb79006bdb881494
parentcc6000f0b9b82b19ea4635edcace2f6ba164adf1
parentc9301d2c296f6822ecb38cc264e74c7186c13124
Merge commit 'intrigeri/po'