merge of '22e3927191bf5e773e6ac986169f1d250ad2902e'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 30 Jul 2007 11:34:45 +0000 (11:34 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 30 Jul 2007 11:34:45 +0000 (11:34 +0000)
commitcf9c9cea3eb814c58c16d66e74e31ef91dce46f0
tree3b11837d7d467dd0028e1cfd651f96c8467389df
parente5755be56a5c005615a0721ed6848694c18bebba
parentcca7de1567a0a1e6cedd31607ebd8700d0ef6ecd
Merge ... '22e3927191bf5e773e6ac986169f1d250ad2902e'
     and '8a78637dc8745f64d6ed43a79d5920abbc1ec456'