merge of '4c79780fdaece8e6888a1693a01627da28f7072a'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 22 Oct 2007 04:02:30 +0000 (04:02 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 22 Oct 2007 04:02:30 +0000 (04:02 +0000)
commit955a0c5c03a8adddaff3fd8e922cfc236b3f16da
treee4b81a5cbabc59bf55714e1526c513e281eb1d22
parent507130d5ffd480a2b494a8b33491a6accdf879ff
parent4680867e6e3354541eb10c3ceefa8c6a8b416ac4
Merge ... '4c79780fdaece8e6888a1693a01627da28f7072a'
     and '56f71aa4e55e5e8bce8d34f80b7adc9bf51fb187'