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)
     and '289b212216560389be0e408d871851f48ee701fe'


Trivial merge