Merge commit '6037a056ea0dda27a286ddcb527b323b58a1c7c7' into gingerbread-plus-aosp * commit '6037a056ea0dda27a286ddcb527b323b58a1c7c7': Fix n-way conf call in SipPhone.
Merge commit '6037a056ea0dda27a286ddcb527b323b58a1c7c7' into gingerbread-plus-aosp * commit '6037a056ea0dda27a286ddcb527b323b58a1c7c7': Fix n-way conf call in SipPhone.