xen-org/xen-api — pull request #377 by dvrabel (2011-10-25 17:19:19+00:00)
Title: Catkin

Merge with master (sort of).

Note that I had to rebase the catkin branch as the merge conflicts were really messy between master and the hacky stuff I had on catkin. Just pulling from catkin probably won't work right.