Merge with master changes.
authorJunio C Hamano <junkio@cox.net>
Tue, 16 Aug 2005 00:02:31 +0000 (17:02 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 16 Aug 2005 00:02:31 +0000 (17:02 -0700)
commit14fb44880c1143ae0259842c808c036e78b516f6
tree179b74d0c4013916191eac71ab05a9dc7968574f
parentda27f4f3f4c23d0276a372726ed050ed13e45168
parent2150cc99fe29fd81db1e9c5971e13bcb78373ebf
Merge with master changes.