am df60830a: am 126ca6f9: Merge "Must hold lock here..." into gingerbread

Merge commit 'df60830a42580af976b0fc88784d1d32191bd1d7'

* commit 'df60830a42580af976b0fc88784d1d32191bd1d7':
  Must hold lock here...