Merge commit 'meins/maint' into maint
authorAndre Noll <maan@systemlinux.org>
Fri, 6 Nov 2009 14:19:32 +0000 (15:19 +0100)
committerAndre Noll <maan@systemlinux.org>
Fri, 6 Nov 2009 14:19:32 +0000 (15:19 +0100)
commitee3b1c1b7eb824a533f59f4cf573f0dcc980d477
tree77e3577f23085c1a59dddd057b9924fd786287b6
parentec3c31a067e27d2ca38072ead146b37e97e22bb9
parent06c82519ac27d0c34e1b6e0c1a1f088fe34e61b3
Merge commit 'meins/maint' into maint