Merge change I3ae1fb19 into eclair-mr2

* changes:
  Increase the default wake lock timeout.