Merge changes from master.
commitca08acca68bf0e1c89fcbc29af18b68ea7bf5c36
authorJunio C Hamano <junkio@cox.net>
Wed, 17 Aug 2005 21:25:08 +0000 (17 14:25 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 17 Aug 2005 21:25:08 +0000 (17 14:25 -0700)
tree8cfaa7e46ea580c54269ef50103b6dafd3ab9493
parent6680153441de6fbba07868d5f54af74d31a3ff13
parentda139813a7242f96e6926fd15881b9df94625132
Merge changes from master.