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

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

Imported Upstream version 0.6.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: 18a5f5dc39b5e8ccbd1a21e3f747bed7d3939624
X-Git-Newrev: 24cf32adf41d41e7ec935dc1d3bd6aafd83d6731

The following commit has been merged in the master branch:
commit 24cf32adf41d41e7ec935dc1d3bd6aafd83d6731
Merge: 18a5f5dc39b5e8ccbd1a21e3f747bed7d3939624 7089ff6c81d71940730d324ee2455a3b5be9b3f8
Author: Bilal Akhtar <bilalakhtar at ubuntu.com>
Date:   Sun May 15 12:50:20 2011 +0530

    Merge commit 'upstream/0.6.0'


-- 
dmedia packaging