Merge commit 'meins/maint' into maint
authorAndre Noll <maan@systemlinux.org>
Mon, 9 Nov 2009 17:30:26 +0000 (18:30 +0100)
committerAndre Noll <maan@systemlinux.org>
Mon, 9 Nov 2009 17:30:26 +0000 (18:30 +0100)
commit8c5c975d5e8f209919283373793c2751a719699b
tree1e962112d7ee00886d429cc0e11d80335e26aa4a
parentee3b1c1b7eb824a533f59f4cf573f0dcc980d477
parentd7f96d2c7c718e3f7d4834fb25b6939a355a0e19
Merge commit 'meins/maint' into maint