merge of '3acc599523c89258a0e3bf8dd3a98c692ad3b555'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 2 Aug 2007 16:31:59 +0000 (16:31 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 2 Aug 2007 16:31:59 +0000 (16:31 +0000)
commit77d305c7a6711702339ef48040b4206dc63ea927
tree64f41944a7b22dffe22288c429d1d0a0074afc42
parent9ff03b934dd0e9649a49002b7a0a4258322722b6
parent9a52e28409e9034630965fa5bbf4f347c3aa3e90
Merge ... '3acc599523c89258a0e3bf8dd3a98c692ad3b555'
     and 'f1003174f8c7f99c993d4a46fe0221bdbf197e7d'