Merge change Ief544bc6 into eclair-mr2

* changes:
  fix grammar in the grant permissions UI
tree: 78aefdb2348cfecbac729099de122ae3625b6542
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE