Merge branch 'master' into next
authorAndre Noll <maan@systemlinux.org>
Thu, 5 Nov 2009 21:49:33 +0000 (22:49 +0100)
committerAndre Noll <maan@systemlinux.org>
Thu, 5 Nov 2009 21:49:33 +0000 (22:49 +0100)

Trivial merge