Merge change I56544d0e into eclair

* changes:
  Fix for 2137900: Be more conservative about poking the wakelock