Added by Anthony Liguori almost 13 years ago
Merge remote-tracking branch 'kwolf/block-stable' into staging