Merge commit 'b31a0277558db5eeb71164ad511467cf5125b853' into upstream-merge
commit03e2784f7a6b5a2c76369809e7a604998cb60671
authorAvi Kivity <avi@redhat.com>
Sat, 29 Aug 2009 07:31:33 +0000 (29 10:31 +0300)
committerAvi Kivity <avi@redhat.com>
Sat, 29 Aug 2009 07:31:33 +0000 (29 10:31 +0300)
tree2fe3297185e933469eee86faadad00a4b3dbfb81
parent05fef194de72ff908633cc03e21052ac20a47e15
parentb31a0277558db5eeb71164ad511467cf5125b853
Merge commit 'b31a0277558db5eeb71164ad511467cf5125b853' into upstream-merge

* commit 'b31a0277558db5eeb71164ad511467cf5125b853':
  Add kvm to new feature convention

Conflicts:
configure

Signed-off-by: Avi Kivity <avi@redhat.com>
configure