Merge branch 'bp_dev/racksapce-win-resource' of https://github.com/vikomall/heat into builds/i1-20131127-g01fb048-andrew_test_2
Merge commit 'refs/changes/42/47042/12' of https://review.openstack.org/openstack/heat into builds/i1-20131127-g01fb048-andrew_test_2
Merge branch 'bp/new_clb_design' of https://github.com/rs-randallburt/heat into builds/i1-20131127-g01fb048-andrew_test_2
Merge branch 'fiv0hfour' of https://github.com/rs-randallburt/heat into builds/i1-20131127-g01fb048-andrew_test_2
Merge branch 'DBaaS_rate_limit' of https://github.com/vikomall/heat into builds/i1-20131127-g01fb048-andrew_test_2
Merge commit 'refs/changes/17/55317/4' of https://review.openstack.org/openstack/heat into builds/i1-20131127-g01fb048-andrew_test_2
Merge branch 'chef_solo_non_blocking' of https://github.com/andrew-plunk/heat into builds/i1-20131127-g01fb048-andrew_test_2