am cf3036eb: (-s ours) am c1cbf452: am 24855c09: merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)

* commit 'cf3036ebef2929f84bc4e34ed1e9d96eefd6a5e7':
  merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)
tree: 23f458f7b2bf07089e03934403762efdce4f4e3b
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE