Merge branch 'master' into next
authorAndre Noll <maan@systemlinux.org>
Mon, 9 Nov 2009 17:31:25 +0000 (18:31 +0100)
committerAndre Noll <maan@systemlinux.org>
Mon, 9 Nov 2009 17:31:25 +0000 (18:31 +0100)
commit1aeb12d89d5334c70be373fa1ef7a547a8fd6ba4
tree7ef5e51338ac1c78d574e4b75aca6a70417635c9
parent5967b31f0e4163a9be4ed5aeb01bd2c6377ffac8
parent95818b8000f6862234a45e8511f4e2425fc25776
Merge branch 'master' into next