automerge cancel

git-svn-id: http://svn.asterisk.org/svn/asterisk/branches/10-digiumphones@398015 f38db490-d61c-443f-a65b-d21fe96a405b