Merge remote-tracking branch 'kwolf/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 15 Jun 2011 14:02:18 +0000 (09:02 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 15 Jun 2011 14:02:18 +0000 (09:02 -0500)
commit651de3f53eb76598e4fed712d80f3602ab590f5f
tree225ac48db5dcaff9641d404ec2760921f76f800e
parent38ca003c72156f5aab75e88f356d980d236ad69e
parentb95f8230e2cda8586922e44e2210da08239a8f31
Merge remote-tracking branch 'kwolf/for-anthony' into staging