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

Trivial merge