am 414628c5: am 9e63ce81: am 092f0341: Merge change I44d4cbec into eclair

Merge commit '414628c55ab0e51c0cc4d7ff34368d76a2e981e8'

* commit '414628c55ab0e51c0cc4d7ff34368d76a2e981e8':
  Fix some SMS encode issues.