[SCM] projectm/master: Merge tag 'upstream/2.1.0+dfsg'

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

Imported Upstream version 2.1.0+dfsg
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 08ad5d27a0d3db25d80a7ef32b44b990655e5b08
X-Git-Newrev: 20ca22a4251e9af1d467ded7e0157f52feb53667

The following commit has been merged in the master branch:
commit 4df8ebf68e8d3d95cb60fe910189d8afbeb198d4
Merge: 90c0c16aa4a81daff4edb48f373d0359774d59ca 247e82d02af8e7a3f2554575c3a4264e0ca74aed
Author: Matthias Klumpp <matthias at nlinux.org>
Date:   Mon May 21 12:51:17 2012 +0200

    Merge tag 'upstream/2.1.0+dfsg'
    
    Upstream version 2.1.0+dfsg


-- 
projectm packaging