am 947d2abd: am 2365b78e: Merge "SIP: misc fixes." into gingerbread

Merge commit '947d2abd82ef68c661fc29fd5167e4c0ba749f71'

* commit '947d2abd82ef68c661fc29fd5167e4c0ba749f71':
  SIP: misc fixes.