[transmageddon: 5/5] Merge branch 'work' of https://github.com/thiagoss/transmageddon

[Christian Fredrik Kalager Schaller <uraeus src gnome org>]

commit dcdae5790f06a2f3059784034e27d43659713b17
Merge: f72cd30 e8c3353
Author: Christian Fredrik Kalager Schaller <christian schaller collabora co uk>
Date:   Mon Aug 1 14:45:07 2011 +0100

    Merge branch 'work' of https://github.com/thiagoss/transmageddon

 src/transcoder_engine.py |    1 +
 src/transmageddon.py     |   14 ++++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)
---