Merge remote-tracking branch 'stefanha/trivial-patches' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 8 Sep 2011 13:59:32 +0000 (08:59 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 8 Sep 2011 13:59:32 +0000 (08:59 -0500)

Trivial merge