Merge the attributes fix in from maint-1.6.6 branch

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

Junio C Hamano committed Jan 10, 2012 at 14:14 UTC 6c65b5ea439165512d128e18829b67688ddab9cc

No changes.