Merge remote branch 'fml/master'
authorAndre Noll <maan@systemlinux.org>
Sat, 19 Dec 2009 12:18:49 +0000 (13:18 +0100)
committerAndre Noll <maan@systemlinux.org>
Sat, 19 Dec 2009 12:18:49 +0000 (13:18 +0100)

Trivial merge