merge of '05ad3485b42ecb00f88755641322f85ba7842784'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 5 Mar 2008 17:12:38 +0000 (17:12 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 5 Mar 2008 17:12:38 +0000 (17:12 +0000)
commit64197d831371bd8450d65a9349be5ab55f366f59
tree10da615da5ef2a2ccf2cefe5883d2c6de738fa1f
parentb63eeefdc195007d494f73316fb205857161c1db
parenta516a5a18205b21b4daddeb5374da8836c2f296c
Merge ... '05ad3485b42ecb00f88755641322f85ba7842784'
     and 'db7e324079b29569e9e6a52a22576a281140b12a'