Merge the attributes fix in from maint-1.6.7 branch

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

Junio C Hamano committed Jan 10, 2012 at 14:24 UTC 55dcc2ebad1b3ed4a6912f6f401f63cd3c71026f

No changes.