Merge branch 't/web_fix'
authorAndre Noll <maan@systemlinux.org>
Tue, 10 Jan 2012 18:43:25 +0000 (19:43 +0100)
committerAndre Noll <maan@systemlinux.org>
Tue, 10 Jan 2012 18:43:25 +0000 (19:43 +0100)

Trivial merge