Merge remote branch 'meins/v0.2' into v0.2
authorAndre Noll <maan@systemlinux.org>
Wed, 25 Aug 2010 01:05:21 +0000 (03:05 +0200)
committerAndre Noll <maan@systemlinux.org>
Wed, 25 Aug 2010 01:05:21 +0000 (03:05 +0200)

Trivial merge