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