[SCM] toonloop/master: Merge commit 'upstream/2.0.4'

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

Imported Upstream version 2.0.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: d9e26826a757fed953c1e5b5eea61de9d89c7bb5
X-Git-Newrev: 10c4273aa899777477ad56d577b2a3d17b617ff4

The following commit has been merged in the master branch:
commit 1a0c49fad0a51766b445f023bd65903c1a6def09
Merge: d9e26826a757fed953c1e5b5eea61de9d89c7bb5 35cac530f0df4176b91f4030991842d0aa28d6c6
Author: Alexandre Quessy <alexandre at quessy.net>
Date:   Sun Dec 5 06:20:55 2010 -0500

    Merge commit 'upstream/2.0.4'


-- 
toonloop packaging