Merge remote branch 'fml/next'
authorAndre Noll <maan@systemlinux.org>
Sat, 30 Jan 2010 21:57:09 +0000 (22:57 +0100)
committerAndre Noll <maan@systemlinux.org>
Sat, 30 Jan 2010 21:57:09 +0000 (22:57 +0100)

Trivial merge