Merge commit 'meins/master'
authorAndre Noll <maan@systemlinux.org>
Wed, 25 Jun 2008 16:39:37 +0000 (18:39 +0200)
committerAndre Noll <maan@systemlinux.org>
Wed, 25 Jun 2008 16:39:37 +0000 (18:39 +0200)
commit39bb1a102b14e3f230a659290622b2d1b1658b44
tree15729abb33a0151ac2ea4a24908bc14a38c37bc2
parent54687ef420e041d61e1b8d82989aab74c9f6b333
parent2968f502b9e01f5e9f0f38ac918ce6ed801b04f1
Merge commit 'meins/master'