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