Merge branch 'master' into bloom
authorAndre Noll <maan@systemlinux.org>
Wed, 24 Dec 2008 12:14:11 +0000 (13:14 +0100)
committerAndre Noll <maan@systemlinux.org>
Wed, 24 Dec 2008 12:14:11 +0000 (13:14 +0100)

Trivial merge