[olpc-powerd/f16] (8 commits) ...fix merge

[Peter Robinson]

Summary of changes:

  752b9a7... further cleanups (*)
  a0c59be... v39 (*)
  e58d7a2... v40 (*)
  c9b050a... add patch to fix compile (*)
  3e6af5d... fix typo (*)
  4d5f3a8... fix spec issue (*)
  84acc26... fix spec issue (*)
  841652a... fix merge

(*) This commit already existed in another branch; no separate mail sent