Merge commit 'meins/maint' into maint
authorAndre Noll <maan@systemlinux.org>
Sun, 25 Oct 2009 16:47:50 +0000 (17:47 +0100)
committerAndre Noll <maan@systemlinux.org>
Sun, 25 Oct 2009 16:47:50 +0000 (17:47 +0100)
commit64481cad8a69c526a3da1dad5c0383316984be2e
tree334f7580f101fb13a7e554f39e429d9b4b48b475
parent4036886aa97bab4d3d891f4fc9d4fcc75fb068b1
parent3f9051d22fcf6e968259946eaf521ac3daac470e
Merge commit 'meins/maint' into maint