| commit | 424b1210d951c206e7c2fb8f2778acbd384eb247 | [log] [tgz] |
|---|---|---|
| author | Thomas Hellstrom <thellstrom@vmware.com> | Mon Jul 04 10:21:35 2011 +0200 |
| committer | Thomas Hellstrom <thellstrom@vmware.com> | Mon Jul 04 10:21:35 2011 +0200 |
| tree | 964884074e08de8072ef535ff5f2ee5f2c416b61 | |
| parent | a221807dc5d69598afd1d0e0a4e715fb82a9f30d [diff] | |
| parent | f81ac1840a25ad39a9d7e46e4951e5eb45a05971 [diff] |
Merge branch 'xa_branch' Conflicts: configure.ac Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>