merge of 'a1f690feff27a3cf8c220262f43412c6cefd8638'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 15 Mar 2007 15:18:06 +0000 (15:18 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 15 Mar 2007 15:18:06 +0000 (15:18 +0000)
commit10c51fbb2fe9394445c658541db485fd5a83e7c1
treed5f83b9ea87451237ec20f9def98973105f42663
parente10fa259f424bdcbd5e26c262bb3521d8ec43e47
parentcc9e12b871b19bb1ed014e5fbba722aae9b84230
Merge ... 'a1f690feff27a3cf8c220262f43412c6cefd8638'
     and 'e7fbe6e21edb50535d695aa0668f424883d1c7a3'