* commit '2340ce6954db2c0a79c57fcba7f45e2fcc20cdc9': update Changelog Conflicts: Changelog Merged-by: Michael Niedermayer <michaelni@gmx.at>