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