am 07fb33ef: (-s ours) am d8f1a540: Merge "Refrain warning when not appropriate. Do not merge" into gingerbread

Merge commit '07fb33efe8b0cbedf518a8afa20d96d8d4bab69a'

* commit '07fb33efe8b0cbedf518a8afa20d96d8d4bab69a':
  Refrain warning when not appropriate. Do not merge
tree: c7f57a471ef7a293ba101955c412b9d2376d3908
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE