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