Merge commit 'gfi/master'
authorJunio C Hamano <junkio@cox.net>
Sun, 29 Apr 2007 08:54:28 +0000 (01:54 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 29 Apr 2007 08:54:28 +0000 (01:54 -0700)
* commit 'gfi/master':


Trivial merge