Merge refs/heads/master from .
authorJunio C Hamano <junkio@cox.net>
Tue, 23 Aug 2005 07:07:17 +0000 (00:07 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 23 Aug 2005 07:07:17 +0000 (00:07 -0700)
1  2 
Makefile

diff --cc Makefile
Simple merge