Merge remote-tracking branch 'kwolf/block-stable' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 28 Nov 2011 17:15:10 +0000 (11:15 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 28 Nov 2011 17:15:10 +0000 (11:15 -0600)
commit971fd751874fb8588d2f4517301f5d8246364db8
treefbc175b426cb2764b0c5362a72416d402cf95517
parent87fddd390ef414fa2967e1b22b14947e7f5f2e14
parentd70ee4bf0f03b8d7d7b5ab03deb80213b840365d
Merge remote-tracking branch 'kwolf/block-stable' into staging