Merge branch 't/error2'
authorAndre Noll <maan@systemlinux.org>
Sun, 1 Aug 2010 11:25:59 +0000 (13:25 +0200)
committerAndre Noll <maan@systemlinux.org>
Sun, 1 Aug 2010 11:25:59 +0000 (13:25 +0200)

Trivial merge