merge of '0a1bbba5cea50e04cabcd0105f2b2fc40814b7a7'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 23 Aug 2007 13:04:59 +0000 (13:04 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 23 Aug 2007 13:04:59 +0000 (13:04 +0000)
commit72eb5a51a982cf2336417a22812b48e26787e398
treeb5cdd1a198ba8878bcf7e8a94b37607036622cb7
parentd9a58941c26ffbe69097449705bce8180c887bda
parent6bb48250893f4d11501a3706f1b1b9d8245e8e1b
Merge ... '0a1bbba5cea50e04cabcd0105f2b2fc40814b7a7'
     and '3b73bd5ada8f044f5d14445933e426ec92ff9f9e'