merge of '0fb63a3a1c21083e64e1fc35d8abe83eabdecfe6'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 8 Mar 2008 20:05:22 +0000 (20:05 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 8 Mar 2008 20:05:22 +0000 (20:05 +0000)
commit2e100a4a97a75b7ea8c6d730d6c1091a27df9418
tree5b50ac0964a763193244d4502a2409c9f65b608a
parent64f8b0c4860530db75a84b745e7ea2b9d5f42341
parent4184f49bebf401c7f61aa045b0265c509b64df15
Merge ... '0fb63a3a1c21083e64e1fc35d8abe83eabdecfe6'
     and 'a7d0911cc51bd1eb437c71feab04198858ad16b8'