Unable to create an instance.

When running the latest tip in trunk I am unable to run an instance. I get the following error in the log files:

2010-10-12 11:35:39-0400 [-] (root): ERROR instance 3732906838: Failed to spawn
2010-10-12 11:35:39-0400 [-] Traceback (most recent call last):
2010-10-12 11:35:39-0400 [-] File "/usr/lib/pymodules/python2.6/nova/compute/manager.py", line 86, in run_instance
2010-10-12 11:35:39-0400 [-] yield self.driver.spawn(instance_ref)
2010-10-12 11:35:39-0400 [-] AttributeError: 'long' object has no attribute 'startswith'
2010-10-12 11:35:39-0400 [-] Unhandled error in Deferred:
2010-10-12 11:35:39-0400 [-] Unhandled Error
 Traceback (most recent call last):
   File "/usr/lib/pymodules/python2.6/nova/exception.py", line 76, in _wrap
     return f(*args, **kw)
   File "/usr/lib/pymodules/python2.6/nova/rpc.py", line 180, in receive
     d = defer.maybeDeferred(node_func, **node_args)
   File "/usr/lib/python2.6/dist-packages/twisted/internet/defer.py", line 125, in maybeDeferred
     result = f(*args, **kw)
   File "/usr/lib/python2.6/dist-packages/twisted/internet/defer.py", line 1014, in unwindGenerator
     return _inlineCallbacks(None, f(*args, **kwargs), Deferred())
 --- <exception caught here> ---
   File "/usr/lib/python2.6/dist-packages/twisted/internet/defer.py", line 891, in _inlineCallbacks
     result = result.throwExceptionIntoGenerator(g)
   File "/usr/lib/python2.6/dist-packages/twisted/python/failure.py", line 338, in throwExceptionIntoGenerator
     return g.throw(self.type, self.value, self.tb)
   File "/usr/lib/pymodules/python2.6/nova/compute/manager.py", line 98, in run_instance
     self._update_state(context, instance_id)
   File "/usr/lib/pymodules/python2.6/nova/compute/manager.py", line 62, in _update_state
     state = self.driver.get_info(instance_ref.name)['state']
   File "/usr/lib/pymodules/python2.6/nova/virt/libvirt_conn.py", line 334, in get_info
     virt_dom = self._conn.lookupByName(instance_name)
   File "/usr/lib/python2.6/dist-packages/libvirt.py", line 1441, in lookupByName
     ret = libvirtmod.virDomainLookupByName(self._o, name)
 exceptions.TypeError: virDomainLookupByName() argument 2 must be string or None, not long