Merge branch 'maint-1.6.1' into maint
commitc0250b6477d2edf58d0a7bc229bfa4f720c1cd58
authorJunio C Hamano <gitster@pobox.com>
Sun, 22 Mar 2009 06:10:42 +0000 (21 23:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 22 Mar 2009 06:10:42 +0000 (21 23:10 -0700)
tree4fbd4c8d180bf95f21722aa77de0e4f350cefe26
parent923cc82c481a99269d397dc86f8b664ba8cb98da
parente10d48de74ec8c01d0528217abf465af7bbf5a56
Merge branch 'maint-1.6.1' into maint

* maint-1.6.1: