xenserver/planex — pull request #35 by euanh (2014-03-06 18:27:38+00:00)
Title: setup: Fix bad merge

Signed-off-by: Euan Harris