Merge remote-tracking branch 'stefanha/trivial-patches' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 12 Aug 2011 13:06:02 +0000 (08:06 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 12 Aug 2011 13:06:02 +0000 (08:06 -0500)

Trivial merge