Merge remote-tracking branch 'stefanha/trivial-patches' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 25 Aug 2011 12:50:07 +0000 (07:50 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 25 Aug 2011 12:50:07 +0000 (07:50 -0500)

Trivial merge