[SCM] composite/master: Merge commit 'upstream/0.006.1'

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

Imported Upstream version 0.006.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 7e6dbe16e8314e7e9344c1d3a1a9ac76b72b8e6f
X-Git-Newrev: 7a3431d54e082c72176fc7f15941fe84489b6555

The following commit has been merged in the master branch:
commit 7a3431d54e082c72176fc7f15941fe84489b6555
Merge: 7e6dbe16e8314e7e9344c1d3a1a9ac76b72b8e6f c74b9ceeb12158c1266db78aa754963521884402
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Fri Jul 15 22:44:07 2011 +0200

    Merge commit 'upstream/0.006.1'


-- 
composite packaging