Merge remote-tracking branch 'stefanha/tracing' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 26 Apr 2011 13:07:49 +0000 (08:07 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 26 Apr 2011 13:07:49 +0000 (08:07 -0500)

Trivial merge