tree 11e5bd7a131daf27eb147c5bb733c40a0f588a31
parent 472de0c851af86d26e3ccebf4154a27393091053
parent a3c4a01fb25a93d2b76d1fde1958ee616c152c5b
author Anthony Liguori <aliguori@us.ibm.com> 1286834919 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1286834919 -0500

Merge remote branch 'kwolf/for-stable-0.13' into stable-0.13