Merge remote-tracking branch 'kwolf/block-stable' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 11 Nov 2011 23:26:37 +0000 (17:26 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 11 Nov 2011 23:26:37 +0000 (17:26 -0600)
commitf302bece891153a7022458fded8406a78b3af806
treeaf5d7b7a0ced95035e89592b233845010d310c7b
parent8e47db6829975a405edc98cd809a6a8856fb80c2
parent811de10540cbedb01be1e3ef3228c1fb073aa2d7
Merge remote-tracking branch 'kwolf/block-stable' into staging