am 236afa68: am 375afcd5: am 4b8ad9ef: Merge from gingerbread

* commit '236afa6806c384a235782cde820a7f01de9e1b82':
tree: 0b8accc2d5b58e5121e60ec38a0a2b829f266455
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE