Merge commit 'athcx/next' into next
authorAndre Noll <maan@systemlinux.org>
Sun, 19 Apr 2009 21:17:38 +0000 (23:17 +0200)
committerAndre Noll <maan@systemlinux.org>
Sun, 19 Apr 2009 21:17:38 +0000 (23:17 +0200)

Trivial merge