Merge change Ifc9dd5c6 into eclair

* changes:
  Fix the reporting of ActiveApnTypes on CDMA