merge of '13170805eb277bcec085eb013dda836930e5bee7'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 28 Mar 2008 15:07:35 +0000 (15:07 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 28 Mar 2008 15:07:35 +0000 (15:07 +0000)
     and 'd2c1007682618105ff49ee76ac59d9b164de9572'


Trivial merge