am 25503f1c: Merge from gingerbread

* commit '25503f1c9f0b5f718052b71dc5b21d1c8576d015':
  fix failing thread object run