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)
commit6a3b87ca8a581b43598c0b48b7727b24774e612e
treeb77ceb4989ffc39c8664486b3d6ad51e09b02e75
parent7a639ad1913a57b05b18134492d7a6d5cb9309a8
parent1403e146fdc3d656d3315f4c32f97f8ae01441ac
Merge ... '02c31916f8203f8e8f2ded060c7f3756a95c9841'
     and '422bef8b6a966bcd08d148e2c1a9a03bf1217087'