Merge remote-tracking branch 'stefanha/trivial-patches' into staging
commit596235300608575ece1828b12a5faf32ebfee3fc
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 1 Nov 2011 18:06:17 +0000 (1 13:06 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 1 Nov 2011 18:06:17 +0000 (1 13:06 -0500)
treed8f458d70ddceae02c9e6e027d68910a91c3c16b
parent90ea59fe7d121c722e1b44cb9bc0fad1ade73686
parent0ce6a434176e274a7e86bcaa268542c5cc402696
Merge remote-tracking branch 'stefanha/trivial-patches' into staging