merge of '02c31916f8203f8e8f2ded060c7f3756a95c9841'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 18 Aug 2007 13:06:59 +0000 (13:06 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 18 Aug 2007 13:06:59 +0000 (13:06 +0000)
     and '422bef8b6a966bcd08d148e2c1a9a03bf1217087'


Trivial merge