merge of '208f1ed94f96d48ebd0a914e436fb7a6e203f681'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 20 Jul 2008 22:09:25 +0000 (22:09 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 20 Jul 2008 22:09:25 +0000 (22:09 +0000)
commit70b50aa832a4f84f3c06db4b3026a23e0059b2ef
treec2d0855a92a7869717cab56cb9d855c0332cfcd0
parentf75762fcbb8174e9c8e47fcc336cd0b5c5fa1a59
parent2a10b31ff00050bb4cece8ab90ec25ed55f59fae
Merge ... '208f1ed94f96d48ebd0a914e436fb7a6e203f681'
     and '377e4d7bcf91440bd806ee920d1b7ff72c44b991'