Merge pull request #141 from ceph/wip-rgw-zone-config

Wip rgw zone config

Reviewed-by: Sage Weil <sage@inktank.com>

diff --cc src/Makefile.am
Simple merge

diff --cc src/common/config_opts.h
Simple merge

diff --cc src/rgw/rgw_rados.cc
Simple merge

diff --cc src/rgw/rgw_rados.h
Simple merge