Merge remote-tracking branch 'aneesh/for-upstream-2' into staging
commit444dc48298c480e42e15a8fe676be737d8a6b2a1
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 25 Aug 2011 12:48:15 +0000 (25 07:48 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 25 Aug 2011 12:48:15 +0000 (25 07:48 -0500)
treebc76c5afaa746c8c27d0457e2035fe38ee45fb6c
parent5b15f27516ce3249c80bd2e0458d8d61f20da415
parent5f524c1ebcc5e0dec0de8940d34f9adb3c7887a1
Merge remote-tracking branch 'aneesh/for-upstream-2' into staging