Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 18:31:26 +0000 (11:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 18:31:41 +0000 (11:31 -0700)
commit04f426246651cb2c75253939cc065c1069744513
tree93af82250ddb9395409af65dca34de246ff461b8
parent682ce8bb37414afe87515123fc6c26f21dd35b15
parentcbd6b089e821a4ff35970531b26e64a2e621ff04
Sync with maint

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