Merge pull request #41 from robhoes/master

xenlight: fix timeout handling
xenlight: minor update to what is now upstream

Signed-off-by: Rob Hoes <rob.hoes@citrix.com>