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