Merge remote branch 'fml/v0.2' into v0.2
authorAndre Noll <maan@systemlinux.org>
Thu, 1 Apr 2010 20:45:33 +0000 (22:45 +0200)
committerAndre Noll <maan@systemlinux.org>
Thu, 1 Apr 2010 20:45:33 +0000 (22:45 +0200)

Trivial merge