Merge change I46b2df15 into eclair

* changes:
  fix [2164183] sometimes device just wants to stay asleep
tree: 34f06f869976fb6da874ffd36e75058f15e2db02
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE