merge of '802e060fdcc7fa600a6f20b2de68a01d0e340e51'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 30 Jul 2007 21:38:25 +0000 (21:38 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 30 Jul 2007 21:38:25 +0000 (21:38 +0000)
commit5c6bb027103f5f8f6815db777c6d3c287701cfd1
tree012ccdb80d57cfd6ef11b0aea9072c39983357b9
parent673c15addeb79e8333ac0dd770f2332e6dba59ce
parent918e226afe2c8fe51e6796d45ad6abcf1baeb679
Merge ... '802e060fdcc7fa600a6f20b2de68a01d0e340e51'
     and 'b473108bc7e5f11f7f14d9c0c2842e1a2a91c0b9'