[SCM] handbrake/master: Merge branch 'upstream'

[siretart at users.alioth.debian.org]

add pkg back in
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 6c90b4d9c3805efe6851bfe20ed81c36b29c7851
X-Git-Newrev: 619a803c29ec77a4a61b9294e0871c6b0022e9a9

The following commit has been merged in the master branch:
commit 619a803c29ec77a4a61b9294e0871c6b0022e9a9
Merge: 9432333bc354584613a19bf4b4d82c2462831628 bfa4c623f80d7a0e9d7756a8088cafef27bc6cc2
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Sep 30 18:48:32 2012 +0200

    Merge branch 'upstream'


-- 
handbrake packaging