commit | 4447d609688e75a40a10b559e3b6ae83843e3095 | [log] [tgz] |
---|---|---|
author | Anthony Liguori <aliguori@us.ibm.com> | Tue Oct 05 14:14:19 2010 -0500 |
committer | Anthony Liguori <aliguori@us.ibm.com> | Tue Oct 05 14:14:19 2010 -0500 |
tree | 94e721b263ae28e68e8f1ccd1aa7db401c8b7129 | |
parent | 48f57044e6a826329ebcac5d5a76d776a14e5d43 [diff] | |
parent | 869564a9c0f78b1972e1ac51e69cb2016af3b060 [diff] |
Merge remote branch 'spice/submit.6' into staging Conflicts: configure Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>