merge of '3a7743fc01171dc57c6955f1ffe9b6701dc58576'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 11 Mar 2008 00:23:54 +0000 (00:23 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 11 Mar 2008 00:23:54 +0000 (00:23 +0000)
commit6ad7bd5327d76f4f0bdb7bf904b8f664423992ca
tree8e46670dff5a494cc903ec5755f0790528000235
parent9222d410fac1fdae6623f0f5f78f86ce3b342b48
parent11bfdc508dcfbb5f6f33799f00b84a15cdc5e979
Merge ... '3a7743fc01171dc57c6955f1ffe9b6701dc58576'
     and 'a495e9cb4d40b047ae63d8cd7818e278baad8881'