Merge refs/heads/master from .
authorJunio C Hamano <junkio@cox.net>
Wed, 24 Aug 2005 23:56:48 +0000 (16:56 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 24 Aug 2005 23:56:48 +0000 (16:56 -0700)
1  2 
Makefile

diff --cc Makefile
Simple merge