Merge branch 'jn/plug-empty-tree-leak'

* jn/plug-empty-tree-leak: merge-recursive: take advantage of hardcoded empty tree revert: plug memory leak in "cherry-pick root commit" codepath

Junio C Hamano committed Aug 25, 2011 at 16:00 UTC 7abd8fb36d90cc68d471a04b59846d7816609116

No changes.