Merge change I88614e93 into eclair

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