Merge commit 'jelmer/master'
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 25 Jul 2008 16:03:34 +0000 (12:03 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 25 Jul 2008 16:03:34 +0000 (12:03 -0400)
commitc401cf4f0ccdf3817fdedc7b0cff5801286dc9bf
tree78d32c09e022b1c91f72be39300bfef41170bf9d
parent89e0de5bc46f87231a3447acb8609641cc9162aa
parent7538d356c8e7cd715c0a7109f84881487f853cfc
Merge commit 'jelmer/master'