Merge with master to pick up safety patches.
commit14022f5b1c5e5408ed5f1e8a91ae423e3228df0c
authorJunio C Hamano <junkio@cox.net>
Fri, 19 Aug 2005 05:10:50 +0000 (18 22:10 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 19 Aug 2005 05:10:50 +0000 (18 22:10 -0700)
tree5361f0c41a1874167053063faed7849c74312e0c
parentd430042bcf4d9da3e5f3cb9fee57c9d73bc40bff
parent75ea6911d64bbe1b202eed61eda3ebaa4d76cb99
Merge with master to pick up safety patches.