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