Merge commit 'fml/master'
authorAndre Noll <maan@systemlinux.org>
Sat, 6 Jun 2009 13:48:34 +0000 (15:48 +0200)
committerAndre Noll <maan@systemlinux.org>
Sat, 6 Jun 2009 13:48:34 +0000 (15:48 +0200)

Trivial merge