tree 4390159c47de5fffde2387a04a4f4b09c6df577f
parent 3996194d5af027337fbabfb55019cdf94636b2f3
author Giovanni Motta <giovannimotta@google.com> 1365725621 -0700
committer Giovanni Motta <giovannimotta@google.com> 1365726285 -0700

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

Change-Id: I6237842e06300541dc3f583e7fef55a5e545688e