merge of '2bc71b9b93f22417784c3a4ed3576a76841878f2'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 5 Apr 2008 22:07:14 +0000 (22:07 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 5 Apr 2008 22:07:14 +0000 (22:07 +0000)
     and 'edac95232b05ccd8efaeee530e0442683d1ef50a'


Trivial merge