Merge commit 'schmonz/master'
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 11 Sep 2009 22:14:58 +0000 (18:14 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 11 Sep 2009 22:14:58 +0000 (18:14 -0400)
commit4a7189965f2831e0c841182902ecae3e53f4af5f
tree230f66fe19c3d2c8608653c8303b042fca8f4a01
parenta7d7acc0f761fff16637e427f30d365b54be1a33
parent5a627f1853b4edcbe38dabcfca37fde477572ef5
Merge commit 'schmonz/master'