merge of '3c8bec0c02c0b0736b8c6cd5ae216848a8cbabf9'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 6 Mar 2008 22:35:44 +0000 (22:35 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 6 Mar 2008 22:35:44 +0000 (22:35 +0000)
commit4d244fcd518a4aa0ec00fe75555e07dcd5be8f47
tree8521f3215cf692b4c31fd9036d5b971966421c88
parent0a5727ba9209d0d3b0d83515f4a767ad5607bdd2
parentc4e170a74a49088a234db4cbbcab10210a8fbb3a
Merge ... '3c8bec0c02c0b0736b8c6cd5ae216848a8cbabf9'
     and '79e634145baa64265863342297f7b440e08d7d22'