fixed merge confilicts
--- Reply to this email directly or view it on GitHub: https://github.com/jclouds/jclouds-labs-openstack/pull/166#issuecomment-63218871
fixed merge confilicts
--- Reply to this email directly or view it on GitHub: https://github.com/jclouds/jclouds-labs-openstack/pull/166#issuecomment-63218871