Merge commit '025a39af346f39743c1e384b9000ce1baee36562' into gingerbread-plus-aosp * commit '025a39af346f39743c1e384b9000ce1baee36562': SIP: misc fixes
Merge commit '025a39af346f39743c1e384b9000ce1baee36562' into gingerbread-plus-aosp * commit '025a39af346f39743c1e384b9000ce1baee36562': SIP: misc fixes