Merge remote branch 'kwolf/for-anthony' into staging
commitb22b7b729d2d617c49381843362bc3ef336d66ec
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 24 Jan 2011 21:16:56 +0000 (24 15:16 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 24 Jan 2011 21:16:56 +0000 (24 15:16 -0600)
tree2a6ddbcee95ca474bb0228ea8d7bece6524eecd0
parent4a2ba232843ac4197c586c1f0f0adbb1eb02fe34
parenta5c062edd272a222179c2bbf54c539c992aefc93
Merge remote branch 'kwolf/for-anthony' into staging