merge of '6c2994d284da06ed60c607d89622f27c35c68b0e'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 11 Jul 2008 09:12:41 +0000 (09:12 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 11 Jul 2008 09:12:41 +0000 (09:12 +0000)
     and 'da3452ccd1d6234cb9dbbfb85923cce269a1daa7'


Trivial merge