Merge branch 'nh/empty-rebase'

* nh/empty-rebase: cherry-pick: regression fix for empty commits

Junio C Hamano committed Jun 1, 2012 at 13:28 UTC 264d5a717bb450ae06969face25c70b000e1358f

No changes.