Merge remote-tracking branch 'stefanha/trivial-patches' into staging
commit684a7a7459e6693b9764ab35e8037f40549606a3
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 28 Nov 2011 17:11:09 +0000 (28 11:11 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 28 Nov 2011 17:11:09 +0000 (28 11:11 -0600)
treedbcd07cad6a9531c6007f1447922da7586a70174
parenta1fd24af4d4d5f96283ba48e7b1e83ffe3b72273
parentbe85c90b74f56dca51782fa3080fcdf88593e045
Merge remote-tracking branch 'stefanha/trivial-patches' into staging