merge of '0ac48f1fc79ebbccb1647c7d31278fc06fe421ef'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 20 Dec 2007 17:21:51 +0000 (17:21 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 20 Dec 2007 17:21:51 +0000 (17:21 +0000)
     and '96df5dae22f2fb36fef351f22763d1b0524d1dfa'


Trivial merge