am ff762299: Merge "Small fixes and cleanup of resource config handling." into honeycomb-mr2

* commit 'ff7622992f39d8e401ab23c5ce6a84f318906e52':
  Small fixes and cleanup of resource config handling.
tree: 5b5695405cb6228a73c6a9388e0cdf8fe8205b80
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE