tree bc76c5afaa746c8c27d0457e2035fe38ee45fb6c
parent 5b15f27516ce3249c80bd2e0458d8d61f20da415
parent 5f524c1ebcc5e0dec0de8940d34f9adb3c7887a1
author Anthony Liguori <aliguori@us.ibm.com> 1314276495 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1314276495 -0500

Merge remote-tracking branch 'aneesh/for-upstream-2' into staging