Merge change Ib23e57cf into eclair

* changes:
  Set roaming based on both data and voice.