am f870ee81: am d580eee2: Merge "SipPhone: switch to its own phone type PHONE_TYPE_SIP." into gingerbread

Merge commit 'f870ee81089ddf5e0388f8b4c7b6a1d437d39ce0'

* commit 'f870ee81089ddf5e0388f8b4c7b6a1d437d39ce0':
  SipPhone: switch to its own phone type PHONE_TYPE_SIP.