Merge remote-tracking branch 'stefanha/tracing' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 22 Sep 2011 15:29:46 +0000 (10:29 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 22 Sep 2011 15:29:46 +0000 (10:29 -0500)
commitbc34d63823b5fc4e41fdffd8b2cd6d348bfb5156
tree4edb0ef10a669cac6d1506086d983c3d8d4eb2ae
parentca258fdc7e3f6d5b03188e3d322675bbef4183e9
parent4aec7a7f81d93133f1ed650d0e0a1b541b10c8fe
Merge remote-tracking branch 'stefanha/tracing' into staging