Merge branch 'jk/maint-t1304-setfacl'
authorJunio C Hamano <gitster@pobox.com>
Thu, 21 Jun 2012 21:42:43 +0000 (14:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Jun 2012 21:42:44 +0000 (14:42 -0700)
Works around a false test failure caused by a bug in ecryptofs.

* jk/maint-t1304-setfacl:
t1304: improve setfacl prerequisite setup

Trivial merge