merge of '2adf3ab14059d254166005fe0eb52600889af8da'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 19 Oct 2006 19:40:21 +0000 (19:40 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 19 Oct 2006 19:40:21 +0000 (19:40 +0000)
     and 'dbda74ec56dedcfca0de706b94ec595c8a0a9233'


Trivial merge