merge of '63c7ad87655c2781ad8b9c81af430596f48a24a6'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 11 Jan 2008 19:38:53 +0000 (19:38 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 11 Jan 2008 19:38:53 +0000 (19:38 +0000)
     and 'bc63a4fa471a2388437163476a7cb1cf8179bb23'


Trivial merge