am fb7e6872: remove *.orig files left over from a merge

Merge commit 'fb7e687240030cec7de1060ea9fe14b2d07e84f8'

* commit 'fb7e687240030cec7de1060ea9fe14b2d07e84f8':
  remove *.orig files left over from a merge