tree a8d34fce10ab6a69f2712cca8456ba57a72678e1
parent 625f9e1f54cd78ee98ac22030da527c9a1cc9d2b
parent d8e8ef4ee05bfee0df84e2665d9196c4a954c095
author Anthony Liguori <aliguori@us.ibm.com> 1314976128 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1314976128 -0500

Merge remote-tracking branch 'stefanha/tracing' into staging