am 9c8de733: Merge "DO NOT MERGE update current config with dhcp settings" into honeycomb-mr1

* commit '9c8de7331475ef6f55449d95d0dfc6dcb425d116':
  DO NOT MERGE update current config with dhcp settings
tree: a14464123bebfff64910d7c44b1759a699a6caa8
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE