merge of 'e57c2aac5313ef7f2859dbe9a325d8705d5d3eef'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 10 Jun 2008 00:25:24 +0000 (00:25 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 10 Jun 2008 00:25:24 +0000 (00:25 +0000)
commit3ae87735fc3eff2d802867a725a97e4cfc8fb3f2
treef6dc5bf0db3c979c622fa79fd9374a712978f960
parentd444393f135cef58d12db6ddccb319f7ecb89b24
parentda8b925e65f4fd85dea06aa0355e7a443671e682
Merge ... 'e57c2aac5313ef7f2859dbe9a325d8705d5d3eef'
     and 'f5fc316539225d7382054c92b8d6cc7f1bca9b73'