diff --git a/ChangeLog b/ChangeLog
index 120f9f57fe..0b08478692 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun 11 09:42:57 CEST 2008 Daniel Veillard <veillard@redhat.com>
+
+	* python/libvir.py python/libvirt-python-api.xml: more python
+	  cleanups by Cole Robinson
+
 Tue Jun 10 17:34:12 CEST 2008 Daniel Veillard <veillard@redhat.com>
 
 	* configure.in: patch  from Cole Robinson to reactivate storage
diff --git a/python/libvir.py b/python/libvir.py
index 3a3889874a..784152abec 100644
--- a/python/libvir.py
+++ b/python/libvir.py
@@ -15,13 +15,17 @@ import types
 
 # The root of all libvirt errors.
 class libvirtError(Exception):
-    def __init__(self, msg, conn=None, dom=None, net=None):
+    def __init__(self, msg, conn=None, dom=None, net=None, pool=None, vol=None):
         Exception.__init__(self, msg)
 
         if dom is not None:
             conn = dom._conn
         elif net is not None:
             conn = net._conn
+        elif pool is not None:
+            conn = pool._conn
+        elif vol is not None:
+            conn = vol._conn
 
         if conn is None:
             self.err = virGetLastError()
diff --git a/python/libvirt-python-api.xml b/python/libvirt-python-api.xml
index da643d73eb..f3b82fc9c7 100644
--- a/python/libvirt-python-api.xml
+++ b/python/libvirt-python-api.xml
@@ -83,6 +83,11 @@
       <return type='int' info='the autostart flag, or None in case of error'/>
       <arg name='domain' type='virDomainPtr' info='a network object'/>
     </function>
+    <function name='virStoragePoolGetAutostart' file='python'>
+      <info>Extract the autostart flag for a storage pool</info>
+      <return type='int' info='the autostart flag, or None in case of error'/>
+      <arg name='pool' type='virStoragePoolPtr' info='a storage pool object'/>
+    </function>
     <function name='virDomainBlockStats' file='python'>
       <info>Extracts block device statistics for a domain</info>
       <return type='virDomainBlockStats' info='a tuple of statistics'/>