Merge branch 'master' into next
authorAndre Noll <maan@systemlinux.org>
Mon, 27 Apr 2009 18:26:34 +0000 (20:26 +0200)
committerAndre Noll <maan@systemlinux.org>
Mon, 27 Apr 2009 18:26:34 +0000 (20:26 +0200)

Trivial merge