Merge remote-tracking branch 'pmaydell/arm-devs.for-upstream' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 12 Dec 2011 16:08:57 +0000 (10:08 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 12 Dec 2011 16:08:57 +0000 (10:08 -0600)

Trivial merge