Merge branch 'maint' to sync with 1.7.2.2
authorJunio C Hamano <gitster@pobox.com>
Thu, 19 Aug 2010 23:04:41 +0000 (16:04 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 19 Aug 2010 23:05:04 +0000 (16:05 -0700)
commitc11969de93e741ae42d1d1d60ce716de6cf5e22b
tree09827db89f8e88f372dea7561b96c92d3ceaebd4
parent5bc99d3f633b9fba288b1b2c3ebde3124f374275
parent8c67c392e1620fc3b749aa9e0b8da13bd84226f8
Merge branch 'maint' to sync with 1.7.2.2

Signed-off-by: Junio C Hamano <gitster@pobox.com>