tree 8cf223766b6a6f6067e3c9d9862edc0039d9c980
parent 596235300608575ece1828b12a5faf32ebfee3fc
parent 54825d2e39b0a809332b5fee837f456d5d9befee
author Anthony Liguori <aliguori@us.ibm.com> 1320170806 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1320170806 -0500

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