am f341270e: remove a *.orig file left over from a merge

Merge commit 'f341270e30dd82bf004f2b87cacae1482ca4d50e'

* commit 'f341270e30dd82bf004f2b87cacae1482ca4d50e':
  remove a *.orig file left over from a merge