Merge commit '8eac20eacd088793547c56e14d602b28d62fb278' into gingerbread-plus-aosp * commit '8eac20eacd088793547c56e14d602b28d62fb278': SIP: implement conference call
Merge commit '8eac20eacd088793547c56e14d602b28d62fb278' into gingerbread-plus-aosp * commit '8eac20eacd088793547c56e14d602b28d62fb278': SIP: implement conference call