Merge commit 'athcx/v0.2' into v0.2
authorAndre Noll <maan@systemlinux.org>
Mon, 19 Apr 2010 14:19:31 +0000 (16:19 +0200)
committerAndre Noll <maan@systemlinux.org>
Mon, 19 Apr 2010 14:19:31 +0000 (16:19 +0200)

Trivial merge