Merge branch 'maint-1.6.6' into maint
commit4ac23f375f144d06d66d04a5e5323388d6f53251
authorJunio C Hamano <gitster@pobox.com>
Mon, 8 Mar 2010 08:35:58 +0000 (8 00:35 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Mar 2010 08:35:58 +0000 (8 00:35 -0800)
treea2b54d5cfa47d4a99411ca7843cd6a16dfd30a12
parent97222d9634b5518cd3d328aa86b52746a16334a7
parentc214f2c80c70c2a3803bf1f3efc323cee5496024
Merge branch 'maint-1.6.6' into maint

* maint-1.6.6: