merge of '0fd25dfc18f365d3b975a9657dae8f1afebdfbc1'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 22 Aug 2007 11:38:40 +0000 (11:38 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 22 Aug 2007 11:38:40 +0000 (11:38 +0000)
commit92e8875b1fd782b8ddfae1d90f273ccf61de4ca0
treee5e9b11b2c43f23e92ca855e2636cfc8b390f069
parent46a07820304c1f03851e903c30387d29fdd17903
parentdb3b571544a78736cf83c13c6cb4758c2e134652
Merge ... '0fd25dfc18f365d3b975a9657dae8f1afebdfbc1'
     and 'e542d3248b64e2f2a33ea5db5feb00bd3806167d'