xen-org/xen-api — pull request #1196 by vbmithr (2013-05-03 11:22:38+00:00)
Title: Fixed conflicts that arose after cherry-picking fix for CA-98944

Signed-off-by: Vincent Bernardoff