Merge commit 'meins/master'
authorAndre Noll <maan@systemlinux.org>
Mon, 9 Nov 2009 17:31:09 +0000 (18:31 +0100)
committerAndre Noll <maan@systemlinux.org>
Mon, 9 Nov 2009 17:31:09 +0000 (18:31 +0100)
commit95818b8000f6862234a45e8511f4e2425fc25776
tree7ef5e51338ac1c78d574e4b75aca6a70417635c9
parentd4522ff1dcfdfff491ef3c27aca1dd1220af0c6f
parentb3d637602e6a730a7bc91384c4ef970eeeb3d44c
Merge commit 'meins/master'