tree 0487403c80a4905aa444d5e349c222d853ca39ac
parent 7cb78eec5cdf6e4131613c64cc1a29476f327242
parent 8df0c7e8fc03882230c31315f63108c049f72dac
author Anthony Liguori <aliguori@us.ibm.com> 1313153469 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1313153469 -0500

Merge remote-tracking branch 'spice/spice.v41' into staging