Merge remote-tracking branch 'aneesh/for-upstream-1' into staging
commiteecaecedec1eb6a47be370a6023bc220a3d30c85
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 12 Aug 2011 12:52:53 +0000 (12 07:52 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 12 Aug 2011 12:52:53 +0000 (12 07:52 -0500)
tree4d7f1233d30911f63d717543f10b7e038d9b684d
parent25a263cdec8e40c81e597b13ffc81cd9397d1fec
parent930b1e173b31e1a0e77535a9868dc3ec1f426a43
Merge remote-tracking branch 'aneesh/for-upstream-1' into staging