Merge remote branch 'kwolf/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 3 Jun 2010 19:55:49 +0000 (14:55 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 3 Jun 2010 19:55:49 +0000 (14:55 -0500)
commit394dd01704a016a6a53853f1c7bfee7e6f1c97a7
treea9d2e040f3127901ffb583ca18527511ce7283f6
parent490a4ef8f98c53c29943ca7c4379526f1618fa78
parentc0e56447598004018a16a6665578644f19fb209e
Merge remote branch 'kwolf/for-anthony' into staging
block.c