Merge branch 'master' of git://git.openstack.org/openstack/horizon into poc
Merge branch 'master' of ssh://github.com/ttripp/horizon into poc