merge of '966f676702aa63ef60cf920469fe2209089901c4'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 8 Feb 2008 14:53:04 +0000 (14:53 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 8 Feb 2008 14:53:04 +0000 (14:53 +0000)
commit2d4024bfd7fc3d0fd30b470e6cf982428abc322e
treee0153d197d24237339984682d9d4c463f58b9407
parent6cb549b2c695afb95c1bf83283bc426b9c764702
parent8e4c88da575adedaf10f029ebab89789a93eb23b
Merge ... '966f676702aa63ef60cf920469fe2209089901c4'
     and 'c22e6cdc0081f060e54d4e152ce8e2adb2546893'