Here is an updated patch against bzr trunk.

-- 
Peter Oliver