Merge commit 'e12b7f5e54730325c751a889ed2e08580b5ef6ba'
authorJoey Hess <joey@gnu.kitenet.net>
Sat, 11 Jul 2009 19:52:51 +0000 (15:52 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Sat, 11 Jul 2009 19:52:51 +0000 (15:52 -0400)
commit42fcafa57d50b3859ab55443e54f446d662ef157
tree2e44e2b823c35c306ad43580e6a2884a4d2afe30
parentd5be42a0910a1f0b0f6a9796fdbb43d1f02284f2
parente12b7f5e54730325c751a889ed2e08580b5ef6ba
Merge commit 'e12b7f5e54730325c751a889ed2e08580b5ef6ba'