Merge commit 'd580eee29b50e1f11485b655fe5e6cc5a564615b' into gingerbread-plus-aosp * commit 'd580eee29b50e1f11485b655fe5e6cc5a564615b': SipPhone: switch to its own phone type PHONE_TYPE_SIP.
Merge commit 'd580eee29b50e1f11485b655fe5e6cc5a564615b' into gingerbread-plus-aosp * commit 'd580eee29b50e1f11485b655fe5e6cc5a564615b': SipPhone: switch to its own phone type PHONE_TYPE_SIP.