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

Merge commit 'd6951fd0f65027cceda39090c52ba49b2308ecd9'

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