Merged internal_ips change

diff --cc debian/changelog
index cf94a94,7a6195c..49474f9
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,108 -1,9 +1,114 @@@
 -invirt-xen-config (0.0.38) unstable; urgency=low
++invirt-xen-config (0.0.39) unstable; urgency=low
+ 
+   * Treat config.hosts.internal_ips as an array
+ 
+  -- Peter Iannucci <iannucci@mit.edu>  Mon, 01 Jul 2013 21:51:00 -0400
+ 
 +invirt-xen-config (0.0.38~glasgall15) precise; urgency=low
 +
 +  * Teach qemu-dm-invirt that /usr/lib/xen moved to /usr/lib/xen-4.1
 +
 + -- Adam Glasgall <glasgall@mit.edu>  Thu, 06 Jun 2013 21:36:37 -0400
 +
 +invirt-xen-config (0.0.38~glasgall14achernya1) precise; urgency=low
 +
 +  * Switch to dh7
 +  * Bump standards version
 +
 + -- Alexander Chernyakhovsky <achernya@mit.edu>  Fri, 31 May 2013 21:16:20 -0400
 +
 +invirt-xen-config (0.0.38~glasgall14) precise; urgency=low
 +
 +  * /usr/lib/xen moved to /usr/lib/xen-4.1. teach invirt-database this.
 +
 + -- Adam Glasgall <glasgall@mit.edu>  Wed, 08 May 2013 00:06:25 -0400
 +
 +invirt-xen-config (0.0.38~glasgall13) precise; urgency=low
 +
 +  * Undo enabling network-bridge; we want to manage our own bridge config
 +    now. Oh, irony.
 +
 + -- Adam Glasgall <glasgall@mit.edu>  Mon, 06 May 2013 19:14:41 -0400
 +
 +invirt-xen-config (0.0.38~glasgall12) precise; urgency=low
 +
 +  * xm was expecting a string and was getting a unistring for machine
 +    name, which resulted in the VM name always being
 +    'invirt-database'. Use passed-in machine_name instead, since that will
 +    be a string. IBTSOCS.
 +
 + -- Adam Glasgall <glasgall@mit.edu>  Mon, 06 May 2013 19:14:23 -0400
 +
 +invirt-xen-config (0.0.38~glasgall11) precise; urgency=low
 +
 +  * Add dependency on ethtool.
 +
 + -- Adam Glasgall <glasgall@mit.edu>  Fri, 26 Apr 2013 22:36:10 -0400
 +
 +invirt-xen-config (0.0.38~glasgall10) precise; urgency=low
 +
 +  * SQLAlchemy API updates in invirt-database xen config
 +
 + -- Adam Glasgall <glasgall@mit.edu>  Fri, 26 Apr 2013 21:14:25 -0400
 +
 +invirt-xen-config (0.0.38~glasgall9) precise; urgency=low
 +
 +  * _really_  correct regexp this time.
 +
 + -- Adam Glasgall <glasgall@mit.edu>  Sat, 13 Apr 2013 17:57:11 -0400
 +
 +invirt-xen-config (0.0.38~glasgall8) precise; urgency=low
 +
 +  * fix typo in regexp
 +
 + -- Adam Glasgall <glasgall@mit.edu>  Sat, 13 Apr 2013 17:49:08 -0400
 +
 +invirt-xen-config (0.0.38~glasgall7) precise; urgency=low
 +
 +  * Correct regexp in s/// over xend-config.sxp
 +
 + -- Adam Glasgall <glasgall@mit.edu>  Sat, 13 Apr 2013 17:46:43 -0400
 +
 +invirt-xen-config (0.0.38~glasgall6) precise; urgency=low
 +
 +  * Enable network-bridge in xend-config.sxp, since Precise doesn't by 
 +    default anymore.
 +
 + -- Adam Glasgall <glasgall@mit.edu>  Sat, 13 Apr 2013 17:40:33 -0400
 +
 +invirt-xen-config (0.0.38~glasgall5) precise; urgency=low
 +
 +  * s/// out the "${XEN_CONFIG_DIR}" reference that was making mako choke
 +
 + -- Adam Glasgall <glasgall@mit.edu>  Sun, 24 Mar 2013 20:31:31 -0400
 +
 +invirt-xen-config (0.0.38~glasgall4) precise; urgency=low
 +
 +  * Oops, no, we don't actually want to uninstall grub. Depend on grub-pc
 +    instead.
 +
 + -- Adam Glasgall <glasgall@mit.edu>  Sun, 24 Mar 2013 17:49:24 -0400
 +
 +invirt-xen-config (0.0.38~glasgall3) precise; urgency=low
 +
 +  * ubuntu-xen-server bit the dust several releases ago. replace it by
 +    explicitly listing the xen bits we need in Depends.
 +
 + -- Adam Glasgall <glasgall@mit.edu>  Sun, 24 Mar 2013 17:44:24 -0400
 +
 +invirt-xen-config (0.0.38~glasgall2) precise; urgency=low
 +
 +  * Bump xen-utils dependency
 +  * Update xend-config.sxp transformer for newer default config
 +
 + -- Adam Glasgall <glasgall@mit.edu>  Sun, 24 Mar 2013 17:37:05 -0400
 +
 +invirt-xen-config (0.0.38~glasgall1) precise; urgency=low
 +
 +  * Bump version for precise
 +
 + -- Adam Glasgall <glasgall@mit.edu>  Thu, 21 Mar 2013 23:24:57 -0700
 +
  invirt-xen-config (0.0.37) unstable; urgency=low
  
    * Support multiple NICs on HVMs.

diff --cc templatize-xend-config
Simple merge