merge of 59ba4be70367579301ec86a4ace2a74be281b35d
authorMichael Lauer <mickey@vanille-media.de>
Fri, 28 Jul 2006 11:15:21 +0000 (11:15 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 28 Jul 2006 11:15:21 +0000 (11:15 +0000)
commit96127b82a4c45b1328d67defe4b715adcdf4e760
tree18a583b24b451cca7a5bcedbe1f09bead1266a82
parent8020fbaa725b7a83d11b997f7b77a95b2cbf40f8
parentc5e234a2ed7696263eb299577c600cfbf31ebc4c
merge of 59ba4be70367579301ec86a4ace2a74be281b35d
     and d685f58742a33aa75bb8b913d7c9adeb338387d1