Merge remote-tracking branch 'fml/master'
authorAndre Noll <maan@systemlinux.org>
Sat, 18 Dec 2010 11:07:36 +0000 (12:07 +0100)
committerAndre Noll <maan@systemlinux.org>
Sat, 18 Dec 2010 11:07:36 +0000 (12:07 +0100)

Trivial merge