merge of '1fc0d39fdc86680d51d6fec00f6cc3ba43d300f3'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 3 Aug 2008 13:04:56 +0000 (13:04 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 3 Aug 2008 13:04:56 +0000 (13:04 +0000)
commit7461c2a07f46bcbd299ca5cb4ed1c101c64a4294
tree3a931bd484bf69419828e6f352c382c437b037b8
parent0820535c7c6e394537e3bbf0aa261b8a33ec5233
parent05b20aef5280513df29b32e76d1bbd1fb66989f6
Merge ... '1fc0d39fdc86680d51d6fec00f6cc3ba43d300f3'
     and '23cc848ee4d3462f245c833eadb2b673eb6ab921'