Merge branch 'master' into cvs
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 4 Sep 2009 21:15:11 +0000 (17:15 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 4 Sep 2009 21:15:11 +0000 (17:15 -0400)
commitfc2bd0afe17a235a0ddfad0a5656c3683d8d180a
treefe870015a89c3720d54921aa942e24b89c6eaa25
parentde7c3aa16ba46adbc3d26e4a5a06e1dcc321fa6c
parent127ed4d6c7a7d2cc518102757b7b4be49d20fce8
Merge branch 'master' into cvs