Merge branch 'gerrit'
authorAndre Noll <maan@systemlinux.org>
Sat, 28 Feb 2009 13:56:11 +0000 (14:56 +0100)
committerAndre Noll <maan@systemlinux.org>
Sat, 28 Feb 2009 13:56:11 +0000 (14:56 +0100)

Trivial merge