Merge branch 'perf'
authorAvi Kivity <avi@redhat.com>
Mon, 19 Apr 2010 09:52:53 +0000 (12:52 +0300)
committerAvi Kivity <avi@redhat.com>
Mon, 17 May 2010 09:17:58 +0000 (12:17 +0300)
Signed-off-by: Avi Kivity <avi@redhat.com>

Trivial merge