merge of 3dae055f5bf6d49d626cfcf0a8062c4c979aaeb2
authorMichael Lauer <mickey@vanille-media.de>
Wed, 25 Oct 2006 23:36:15 +0000 (23:36 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 25 Oct 2006 23:36:15 +0000 (23:36 +0000)
commita653ee5ba3a0d9e63e899a4498f2cd4fc16dfc05
treec9e42ce7d30ad0af087948838b23a32ba83bbe51
parenteaee660696fc304f2cc9de2b15361872ce566547
parentcbacc000d48cfcc9ce9e01e8e1a1aad899cce6be
merge of 3dae055f5bf6d49d626cfcf0a8062c4c979aaeb2
     and ecc737f0c1718588d8ed3722d6156d3c676fed6b