merge of 5ea9eb6f097fe0b646889d1b3a1312d9d7fc796e
authorMichael Lauer <mickey@vanille-media.de>
Sat, 19 Aug 2006 16:02:31 +0000 (16:02 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 19 Aug 2006 16:02:31 +0000 (16:02 +0000)
commit74548169592daa787b2813602acfc624aa8d4828
treed3bc69db22c58263c4ec95a04440449119f3049e
parent57d56f499980919d60868a6ec694088cffb2f5bb
parenteadf8c368c891c853e4857181ae6a8d6717b880b
merge of 5ea9eb6f097fe0b646889d1b3a1312d9d7fc796e
     and 67adbb4efb9e9642f8b5476abd6692720c8cd642