am f95bd0fe: Merge "Argh forget to include my final part of the change." into honeycomb

* commit 'f95bd0feb57f1503be7c08083c0a4d22286256e8':
  Argh forget to include my final part of the change.
tree: 6ef0a8feb57c4112b12022e195ae0182622cfb22
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE