Merged changes and fixed python xen bindings

diff --combined debian/changelog
index 6e8a7bb,a538b6c..dab529f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,21 +1,28 @@@
- xvm-munin-config (0.0.14dvorak42) precise; urgency=low
 -xvm-munin-config (0.0.14.1~dvorak42) precise; urgency=low
++xvm-munin-config (0.0.15) precise; urgency=low
+ 
 -  * Bumped version for precise-dev.
++  * Added fix for python xen bindings to host xen_cpu script.
+ 
 - -- Steven Valdez <dvorak42@mit.edu>  Mon, 17 Jun 2013 20:43:37 -0400
++ -- Steven Valdez <dvorak42@mit.edu>  Thu, 20 Jun 2013 14:21:09 -0400
+ 
 -xvm-munin-config (0.0.14~dvorak) precise; urgency=low
++xvm-munin-config (0.0.14.1~dvorak42) precise; urgency=low
  
 -  * Bumped version number.
 +  * Bumped version for precise-dev.
  
 - -- Steven Valdez <dvorak42@mit.edu>  Mon, 17 Jun 2013 20:23:19 -0400
 + -- Steven Valdez <dvorak42@mit.edu>  Mon, 17 Jun 2013 20:43:37 -0400
  
- xvm-munin-config (0.0.14~dvorak) precise; urgency=low
 -xvm-munin-config (0.0.13~dvorak42) unstable; urgency=low
++xvm-munin-config (0.0.14~dvorak42) unstable; urgency=low
  
-   * Added ::ffff:$IP to list of allowed IPs
+   * Added ::ffff:$IP mapped IPv4 address to allowed list.
  
-  -- Steven Valdez <dvorak42@mit.edu>  Mon, 17 Jun 2013 19:54:55 -0400
+  -- Steven Valdez <dvorak42@mit.edu>  Mon, 17 Jun 2013 20:07:02 -0400
  
 +xvm-munin-config (0.0.14) unstable; urgency=low
 +
 +  * Switch to dh7
 +  * Bump standards version
 +    
 + -- Alexander Chernyakhovsky <achernya@mit.edu>  Sat, 01 Jun 2013 15:02:55 -0400
 +
  xvm-munin-config (0.0.13) unstable; urgency=low
  
    * Ensure that UUIDs begin with a letter and not a number, to work around

diff --combined host/usr/share/xvm-munin-host-config/plugins/xen_cpu
index 06850cf,06850cf..988ad0f
--- 1/host/usr/share/xvm-munin-host-config/plugins/xen_cpu
--- 2/host/usr/share/xvm-munin-host-config/plugins/xen_cpu
+++ b/host/usr/share/xvm-munin-host-config/plugins/xen_cpu
@@@ -1,5 -1,5 +1,6 @@@
  #!/usr/bin/python
--
++import sys
++sys.path.append('/usr/lib/xen-default/lib/python/')
  from xen.xm.main import SERVER_LEGACY_XMLRPC, SERVER_XEN_API, parseServer, parseAuthentication
  from xen.xend import sxp
  import atexit

diff --combined templatize-munin-config
index 72ccf45,af362d2..af362d2
--- 1/templatize-munin-config
--- 2/debian/transform_munin-node.conf.xvm.mako
+++ b/templatize-munin-config
@@@ -21,7 -21,7 +21,7 @@@ END 
    print <<'EOF';
  % for host in cfg.get('monitoring', []):
  allow ^${host.ip.replace('.', '\.')}$
- allow allow ^::ffff:${host.ip.replace('.', '\.')}$
+ allow ^::ffff:${host.ip.replace('.', '\.')}$
  % endfor
  EOF
  }