tree 31ff5cc31b10a4a48f854d8e06090c49f92a6720
parent 5689dc6557cecfd4318dea5490ecac4967081aed
parent 5a61cb60d6ee8d49c553d7959363df26b55f4873
author Anthony Liguori <aliguori@us.ibm.com> 1315591797 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1315591797 -0500

Merge remote-tracking branch 'stefanha/trivial-patches' into staging