Merge branch 'master' into tova
authorJoey Hess <joey@kodama.kitenet.net>
Tue, 29 Jul 2008 19:40:23 +0000 (15:40 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Tue, 29 Jul 2008 19:40:23 +0000 (15:40 -0400)
commit64def3eaeae4ddbe5cee61d08612da1eb1bc54d3
treefd06c2a8227fe3c5636b94b3337f00ba762db9ac
parenta02c3f46ea79313a4e0f6df924efac067b0fd177
parentd6c73e9ef6dcd89ade9ca64755d683ac88d46ae7
Merge branch 'master' into tova