Merge with master of Avi's kvm.gitmaster
commit2f8dbea8010f01416c21ea455ffa02343719b7db
authorXiantao Zhang <xiantao.zhang@intel.com>
Mon, 25 Jul 2011 01:06:21 +0000 (25 09:06 +0800)
committerXiantao Zhang <xiantao.zhang@intel.com>
Mon, 25 Jul 2011 01:06:21 +0000 (25 09:06 +0800)
tree78ba3627f0f550379f02eb3a77d85e3f6190c52c
parent246b1295e6c42230462b0cb2d742ba4dac7925aa
parent681fb677ace0754589792c92b8dbee9884d07158
Merge with master of Avi's kvm.git

Merge branch 'avi'