Merge remote branch 'origin/master' into pci
authorMichael S. Tsirkin <mst@redhat.com>
Wed, 12 Jan 2011 15:39:36 +0000 (17:39 +0200)
committerMichael S. Tsirkin <mst@redhat.com>
Wed, 12 Jan 2011 15:39:36 +0000 (17:39 +0200)

Trivial merge