am 54146a63: Merge "DO NOT MERGE. may fix build on some version of gcc" into gingerbread

* commit '54146a634e0e66a5e4732ba1a80079a1e93bdd8a':
  DO NOT MERGE. may fix build on some version of gcc
tree: d3ab7b42eae95f1b0ea7b186adf4a1def484babf
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE