# HG changeset patch
# User mru
# Date 1183618022 0
# Node ID 429a90b631a56de1cdcf80dfb9f54ea5cde295c8
# Parent  02dd5e0d7e463fa39757a75033fc8ac28b0741e6
Merge branch 'master' of /var/git/ffmpeg/