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)
commit358c360feb346dff8f911e2d1dbcdd6319393f1d
treea9d2e040f3127901ffb583ca18527511ce7283f6
parent41ef56e61153d7bd27d34a634633bb51b1c5988d
parent1a396859105c4c27fdec08180be26288b8a629a3
Merge remote branch 'kwolf/for-anthony' into staging
block.c