Merge change I8dfd6ea8 into eclair

* changes:
  Handle bad lines in /proc/wakelocks : Fix for 2124260