Merge remote branch 'athcx/v0.2' into v0.2
authorAndre Noll <maan@systemlinux.org>
Sun, 18 Apr 2010 23:14:18 +0000 (01:14 +0200)
committerAndre Noll <maan@systemlinux.org>
Sun, 18 Apr 2010 23:14:18 +0000 (01:14 +0200)

Trivial merge