merge of 'aac87a2141ed5dcc6cf1e3015a21d15463f3d048'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 13 Jun 2008 18:38:48 +0000 (18:38 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 13 Jun 2008 18:38:48 +0000 (18:38 +0000)
commitc2ecee68b3cf7a30ffb34756dbaa888e76a36fe9
tree359177acef9ccf4844f249758ff14c81da67abcd
parent61b3dd67bad9d7ed1c27f30a9d9eafb03034b77f
parent9a2c8e90f77325a2b21f41d7ac83a0f040167349
Merge ... 'aac87a2141ed5dcc6cf1e3015a21d15463f3d048'
     and 'c407c3e3af9b704a138bada2e0b7c565f8c293be'