Merge remote-tracking branch 'aneesh/for-upstream-5' into staging
commit62ec6073cd07b847c296b3a1fa19894293f8155d
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 29 Sep 2011 18:32:05 +0000 (29 13:32 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 29 Sep 2011 18:32:05 +0000 (29 13:32 -0500)
tree19fc1772d9cabd7f5590e33374d58a3f4b38d0ba
parent0bce98df2639aef1e8af90b271aa91e16d695408
parent5f5422258e1f50f871bafcc5bfb2b498f414a310
Merge remote-tracking branch 'aneesh/for-upstream-5' into staging