Merge commit 'meins/master'
authorAndre Noll <maan@systemlinux.org>
Fri, 11 Jul 2008 15:08:51 +0000 (17:08 +0200)
committerAndre Noll <maan@systemlinux.org>
Fri, 11 Jul 2008 15:08:51 +0000 (17:08 +0200)
commit415a84f1c06c5779dfbfa140e876852c89abdc38
treee7e29f5ced6f77d375ec01e3e4ed036d0cec3632
parent122af971c336b33df2e7233d3cea3287bbdae712
parente7214688c1d5d446d7e5639beb382f92e0e738a1
Merge commit 'meins/master'