tree 77c55ab45310cbeced2a05e1f85a109bf2efd481
parent cfb41c82ab9c468e599d3603ffcebeb81b6577ca
parent cbcc6336ce9e5c048821b136649712e078c4d05f
author Anthony Liguori <aliguori@us.ibm.com> 1296595368 -0600
committer Anthony Liguori <aliguori@us.ibm.com> 1296595368 -0600

Merge remote branch 'spice/spice.v29.pull' into staging

Conflicts:
	trace-events