[SCM] drc/master: Merge commit 'upstream/3.1.1'

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

Imported Upstream version 3.1.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: e63b2cfdaf0302446dacab6fa488f3bbbf447176
X-Git-Newrev: f49b74f3b53715e26637b10e9a7cf25f4160a4cc

The following commit has been merged in the master branch:
commit f49b74f3b53715e26637b10e9a7cf25f4160a4cc
Merge: e63b2cfdaf0302446dacab6fa488f3bbbf447176 d4f7bb5b841b2b7bf2d9b3c8e469e0c6888c30c0
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue Aug 16 20:15:42 2011 +0200

    Merge commit 'upstream/3.1.1'


-- 
drc packaging