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

Trivial merge