Merge remote-tracking branch 'kwolf/for-anthony' into staging
commite86d9b12b52a2e1cf9e18d55f471fa085911b166
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 26 Oct 2011 15:29:24 +0000 (26 10:29 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 26 Oct 2011 15:29:24 +0000 (26 10:29 -0500)
treec1cdec953a4ce7e7c5ce5490f8220fac943db385
parent0ec024f63696edb42c9841e756811ba31fd18ab8
parent6db39ae2e250f15da17462444ea18a9fcef41e05
Merge remote-tracking branch 'kwolf/for-anthony' into staging