[SCM] kmidimon/master: Merge commit 'upstream/0.7.4'

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

Imported Upstream version 0.7.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 88865a014dce7228f4513c79a974a9542770e92d
X-Git-Newrev: 78cd3cc8c3426a9b10a801790213639c25ea8f4a

The following commit has been merged in the master branch:
commit 5dbda40c7668dedbe7bcab2a41579a2352ada05a
Merge: 88865a014dce7228f4513c79a974a9542770e92d 0d62f608dae2d569c2e8c9f05f3f58924d590df7
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Mon Nov 22 16:34:26 2010 +0100

    Merge commit 'upstream/0.7.4'


-- 
kmidimon packaging