Merge commit 'mst/pci' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 7 Dec 2009 20:31:38 +0000 (14:31 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 7 Dec 2009 20:31:38 +0000 (14:31 -0600)

Trivial merge