Merge branch 'jc/maint-1.6.0-pack-directory'
commitf474c526618d5d1111b585a6344e012fb731d3fe
authorJunio C Hamano <gitster@pobox.com>
Sun, 1 Mar 2009 00:31:02 +0000 (28 16:31 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 1 Mar 2009 00:31:02 +0000 (28 16:31 -0800)
tree6d73ae897c7d9eee9603ee1dfb88cc30e7444142
parent12ef3d84393025af044869be7de4c8e8aa1e025f
parent2c626e5fa8a46f647b88fb32d7b28d573e8631bf
Merge branch 'jc/maint-1.6.0-pack-directory'

* jc/maint-1.6.0-pack-directory:
  Fix odb_mkstemp() on AIX
wrapper.c