tree d8f458d70ddceae02c9e6e027d68910a91c3c16b
parent 90ea59fe7d121c722e1b44cb9bc0fad1ade73686
parent 0ce6a434176e274a7e86bcaa268542c5cc402696
author Anthony Liguori <aliguori@us.ibm.com> 1320170777 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1320170777 -0500

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