merge of '32e6a3c5d4994942e12a0f14ff64ebd224726e17'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 20 Aug 2007 20:55:23 +0000 (20:55 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 20 Aug 2007 20:55:23 +0000 (20:55 +0000)
commitcc67c28f0b7356cda6224810d36d557dc94cbeca
treef811a59f6895ea9e36f0d44c0d5fb47afd94f8a3
parentcd09e1bf4756dd8000a42ae21a41ae2f69da485e
parentf1e340b342ef1035865d145f0ab54afb8ace2f40
Merge ... '32e6a3c5d4994942e12a0f14ff64ebd224726e17'
     and 'f1d39ac0c47301d60716c311f9babd62a0c15fc2'