Merge branch 'xa_branch'
authorThomas Hellstrom <thellstrom@vmware.com>
Mon, 4 Jul 2011 08:21:35 +0000 (10:21 +0200)
committerThomas Hellstrom <thellstrom@vmware.com>
Mon, 4 Jul 2011 08:21:35 +0000 (10:21 +0200)
commit424b1210d951c206e7c2fb8f2778acbd384eb247
tree964884074e08de8072ef535ff5f2ee5f2c416b61
parenta221807dc5d69598afd1d0e0a4e715fb82a9f30d
parentf81ac1840a25ad39a9d7e46e4951e5eb45a05971
Merge branch 'xa_branch'

Conflicts:
configure.ac

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
configure.ac