am edc68a00: Merge "Attempt to reduce problems from issue #3183612" into gingerbread

* commit 'edc68a001cd94d2011029004cb27231432a18575':
  Attempt to reduce problems from issue #3183612
tree: 1c6db7a9e7e55e8c51db4bd409c033b5adc03a55
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE