tree b7bad9c923765b123703a738539bc66afb765a56
parent 99cce9fa4e091fd7ead1926e1c0db016ef293f36
parent 7665385a8580ee5cea2cae44e1b58d6d7518a156
author Anthony Liguori <aliguori@us.ibm.com> 1307553238 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1307553238 -0500

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