am e0e126ba: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward

Merge commit 'e0e126bad38e267e5b4e31b9981ce2858b811e04' into gingerbread-plus-aosp

* commit 'e0e126bad38e267e5b4e31b9981ce2858b811e04':
  Compare only network portion to determine if number is voicemail.
  Fixing use of green button in call log