merge of 'b805c5a50c8090844ec5ef1b84d102464acb782d'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 29 Feb 2008 19:22:07 +0000 (19:22 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 29 Feb 2008 19:22:07 +0000 (19:22 +0000)
commit3a31a71771de7ddde61e50e44016608364d77e35
treee7322104e5bfe0339986c2453685a2f0194470c1
parent5c6dcfb8dac702fe24cb8628bbd1acf5eb58e1e9
parentd8618d0ce0ee1bf7ad72efac9cbf5626a2897698
Merge ... 'b805c5a50c8090844ec5ef1b84d102464acb782d'
     and 'b875e862e2ccb0103de09d87184dc882abb4a8ad'