Merge commit 'dkg/master'
authorJameson Graef Rollins <jrollins@phys.columbia.edu>
Sat, 21 Jun 2008 21:08:34 +0000 (17:08 -0400)
committerJameson Graef Rollins <jrollins@phys.columbia.edu>
Sat, 21 Jun 2008 21:08:34 +0000 (17:08 -0400)
commit6a202af09f5a1bc47069e5e36dbdfa3f6b392a5b
tree0a6a6b75b8410e060a404ce843dd9d81eda6f7d7
parentbee2295c0e205787584788d1e611e92ec6b0fe96
parenta415f1cfcc2b588ef0efcb62b134639810eb820d
Merge commit 'dkg/master'

Conflicts:

src/seckey2sshagent
src/seckey2sshagent