Merge commit 'meins/master'
authorAndre Noll <maan@systemlinux.org>
Mon, 7 Jul 2008 08:53:31 +0000 (10:53 +0200)
committerAndre Noll <maan@systemlinux.org>
Mon, 7 Jul 2008 08:53:31 +0000 (10:53 +0200)
commit122af971c336b33df2e7233d3cea3287bbdae712
tree9258e1d61d46dada2ee2090c35578f8a49cd371a
parent753b26859be2150d3f4e7840a86412f96f60627a
parentd3989f99f26082c8e69dddcc9be13b7c4d09421d
Merge commit 'meins/master'