[SCM] foo-yc20/master: Merge commit 'upstream/1.2.1'

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

Imported Upstream version 1.2.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: 5c8876529483da5b04ead646bad8818b20e65f2f
X-Git-Newrev: 4afaec2e1c79b20b7880698257889625bb51d035

The following commit has been merged in the master branch:
commit 5a723f088c1e87432d15beda0989f99afa1beb92
Merge: 5c8876529483da5b04ead646bad8818b20e65f2f 9ab89fd05eca94835534c45ea6b391c6f0db4bf3
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Tue Jan 25 14:19:14 2011 +0100

    Merge commit 'upstream/1.2.1'


-- 
foo-yc20 packaging