merge of '1549b0afc63f5679fb6877ec547a593b858995b3'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 23 Aug 2007 10:24:36 +0000 (10:24 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 23 Aug 2007 10:24:36 +0000 (10:24 +0000)
commitee9d8247a287e6cf8266d1020f947539f9274730
treedda2f9e56065762d34d3eae22fc9cb65e551fb41
parent152f0766fdcf4df7faa2a73b9b2994b767049064
parent5bc2ff2c959dbdb66775486da22a557d27a445bc
Merge ... '1549b0afc63f5679fb6877ec547a593b858995b3'
     and '289b212216560389be0e408d871851f48ee701fe'