- Patched from trunk support for xid.
- Two minor fixes, also from trunk.

Change-Id: I6237842e06300541dc3f583e7fef55a5e545688e
7 files changed