[SCM] swami/master: Merge commit 'upstream/2.0.0+svn384'

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

Imported Upstream version 2.0.0+svn384
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 42f43975c7aad64fb65500f367c38886b881f41f
X-Git-Newrev: ef7462f8135f8c1668a5371ea96dd751ae3a3885

The following commit has been merged in the master branch:
commit ef7462f8135f8c1668a5371ea96dd751ae3a3885
Merge: 42f43975c7aad64fb65500f367c38886b881f41f 710d43a3144b7675833ee103c3b520f757f24b55
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Fri Dec 3 00:58:15 2010 +0100

    Merge commit 'upstream/2.0.0+svn384'


-- 
swami packaging