Merge branch 'master' into next
authorAndre Noll <maan@systemlinux.org>
Mon, 20 Jul 2009 16:54:49 +0000 (18:54 +0200)
committerAndre Noll <maan@systemlinux.org>
Mon, 20 Jul 2009 16:54:49 +0000 (18:54 +0200)
commitf74525557a0f63090de04fcb2ad401db0783f9a3
tree3d8e2f669e9c27733a331a318826d305705875d9
parent3708571c5996ee656aa374989ccfa06bd3617c76
parentd3876893e9c895b98d2d2b27942f7c235175a4e1
Merge branch 'master' into next