am f5949e0e: (-s ours) am 9c8de733: Merge "DO NOT MERGE update current config...
am f5949e0e: (-s ours) am 9c8de733: Merge "DO NOT MERGE update current config with dhcp settings" into honeycomb-mr1
* commit 'f5949e0e':
DO NOT MERGE update current config with dhcp settings