Merge change Ie8672184 into eclair-mr2

* changes:
  Add error code column to SMS