[SCM] dmedia/master: Merge commit 'upstream/11.10.0'

[bilalakhtar-guest at users.alioth.debian.org]

Imported Upstream version 11.10.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: a7aefda28789301b862f8eb5aaf78c4cff4769f1
X-Git-Newrev: 83a6e2deb4a6e445f7635c6dce37bcee9aece055

The following commit has been merged in the master branch:
commit c33cd175b49e54cc4197f26847644baf8d971922
Merge: 4a821803bac3e45626dc1cc69f096d604c76d3fa dd7e87a46cc5a136a86db46bd544d2ae9e07f6cb
Author: Bilal Akhtar <bilalakhtar at ubuntu.com>
Date:   Sun Nov 20 18:05:41 2011 -0500

    Merge commit 'upstream/11.10.0'


-- 
dmedia packaging