am 625de488: am e2055fe4: Merge "Bug 2673557: rename datamessaging" into froyo

Merge commit '625de488973f262e56d3ee6825a8cf1ebaee089b' into kraken

* commit '625de488973f262e56d3ee6825a8cf1ebaee089b':
  Bug 2673557: rename datamessaging