Imported Upstream version 2014.1.a40.g019d753
Merge tag 'upstream/2014.1.a40.g019d753'

Upstream version 2014.1.a40.g019d753

Conflicts:
	designate.egg-info/PKG-INFO
Upstream snapshot 2014.1.a40.g019d753