am 05059b5b: am 8226140c: Merge from gingerbread

* commit '05059b5b35ade5957b8dfbb21b09e318a94232ed':
tree: 12a552a7b5527f5337adab29948ca5123dfbece3
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE