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)
commit540903ed8e025cc0c126b87ce41012634ce325a3
treece10253ecf5635d92f3f71981d2853cadc125513
parent10dcfbd327aaf867c5d1053b42fdb2e298888f6b
parent41cb83840f92b8c643fdb7692cb21293b380a89f
Merge remote-tracking branch 'stefanha/tracing' into staging