[SCM] gmerlin-encoders/master.ubuntu: Merge branch 'upstream' into master.ubuntu

[alessio at users.alioth.debian.org]

Imported Upstream version 1.2.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master.ubuntu
X-Git-Reftype: branch
X-Git-Oldrev: 339b6eff20d1acebfb9ec7229f297039c0d3d0c0
X-Git-Newrev: 43c2adc3ab3f8cc0eeda5084501d3756dbf96048

The following commit has been merged in the master.ubuntu branch:
commit 9ae7df8990078633d3939756da463e719bb46a32
Merge: 339b6eff20d1acebfb9ec7229f297039c0d3d0c0 a5529601424a0060010999bdf9b8e8b354149a5f
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Jun 12 12:04:15 2012 +0200

    Merge branch 'upstream' into master.ubuntu


-- 
gmerlin-encoders packaging