Updated camera/xh (sip updates)
Merge git://github.com/esrf-bliss/Lima

* git://github.com/esrf-bliss/Lima:
  Updated camera/xh (sip updates)

Conflicts:
	camera/xh