Merge branch 'block-error-warning'
authorDennis Schafroth <dennis@indexdata.com>
Wed, 7 Mar 2012 11:20:14 +0000 (12:20 +0100)
committerDennis Schafroth <dennis@indexdata.com>
Wed, 7 Mar 2012 11:20:14 +0000 (12:20 +0100)

Trivial merge