Merge remote branch 'fml/next' into next
authorAndre Noll <maan@systemlinux.org>
Tue, 25 Aug 2009 17:17:43 +0000 (19:17 +0200)
committerAndre Noll <maan@systemlinux.org>
Tue, 25 Aug 2009 17:17:43 +0000 (19:17 +0200)

Trivial merge