Merge branch 'debian/icehouse' of ssh://git.debian.org/git/openstack/neutron into...

Conflicts:
	debian/changelog

diff --cc debian/changelog
index a659c730e0573c9983c7fc9018e93cb9bee2b7fe,1e64a0dada91ed2b2ff06efe74b006fc60cadb6e..c30edf0aac58f59d57bcc392c26870e6d1b2b5e8
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,8 +1,11 @@@
  neutron (2014.1-7) unstable; urgency=medium
  
 +  * Updates the OVS_lib_defer_apply_doesn_t_handle_concurrency.patch patch
 +    (Closes: #750415).
 +  * Now build-depends on openstack-pkg-tools (>= 12~).
+   * Added missing dbconfig-common dependency.
  
 - -- Thomas Goirand <zigo@debian.org>  Tue, 03 Jun 2014 15:46:32 +0800
 + -- Thomas Goirand <zigo@debian.org>  Thu, 05 Jun 2014 07:25:38 +0000
  
  neutron (2014.1-6) unstable; urgency=high
  

diff --cc debian/control
Simple merge