merge of 14bd8d9b654cd46ec71ba3b5312ad1d28ec2550e
authorMichael Lauer <mickey@vanille-media.de>
Sat, 21 Oct 2006 21:38:31 +0000 (21:38 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 21 Oct 2006 21:38:31 +0000 (21:38 +0000)
commit18cd5fdfe971d1054e00036215b7989bf3444115
tree5d807edfeafce35a4e14386d5f1db621e6048ce9
parentcb354177b6f3ade84aec98e48dfcef3f4f916aaf
parent7895ec720877b436b6a143bbe7f6d24c1b91cff6
merge of 14bd8d9b654cd46ec71ba3b5312ad1d28ec2550e
     and dd230f1511e357183e0d179a16d60af7265a8cf1