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