am 789b11c7: (-s ours) am 926780b0: Merge "DO NOT MERGE" into eclair

Merge commit '789b11c715af48a0379b8b1f90d7a829ac6a8145'

* commit '789b11c715af48a0379b8b1f90d7a829ac6a8145':
  DO NOT MERGE