'invalid literal for int' when listing a image snapshot

Using nova trunk bzr 1492. I'm getting the following error in nova-api.log when listing images (with an image snapshot):

(nova.api.openstack): TRACE: File "/usr/lib/pymodules/python2.6/nova/api/openstack/images.py", line 201, in detail
(nova.api.openstack): TRACE: return dict(images=[builder(image, detail=True) for image in images])
(nova.api.openstack): TRACE: File "/usr/lib/pymodules/python2.6/nova/api/openstack/views/images.py", line 128, in build
(nova.api.openstack): TRACE: image = ViewBuilder.build(self, image_obj, detail)
(nova.api.openstack): TRACE: File "/usr/lib/pymodules/python2.6/nova/api/openstack/views/images.py", line 72, in build
(nova.api.openstack): TRACE: self._build_server(image, image_obj)
(nova.api.openstack): TRACE: File "/usr/lib/pymodules/python2.6/nova/api/openstack/views/images.py", line 106, in _build_server
(nova.api.openstack): TRACE: "id": common.get_id_from_href(serverRef),
(nova.api.openstack): TRACE: File "/usr/lib/pymodules/python2.6/nova/api/openstack/common.py", line 182, in get_id_from_href
(nova.api.openstack): TRACE: return int(urlparse.urlsplit(href).path.split('/')[-1])
(nova.api.openstack): TRACE: ValueError: invalid literal for int() with base 10: 'cb8360cb-3a41-4620-8f7f-c804539dc698'
(nova.api.openstack): TRACE: