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

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

Imported Upstream version 2.0.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 66bd8443b06c6a25f46464fef3f1c2a249a3ac1d
X-Git-Newrev: e6f0a416ffa3be28a09c4b77a97fcf7025992ff4

The following commit has been merged in the master branch:
commit e6f0a416ffa3be28a09c4b77a97fcf7025992ff4
Merge: 66bd8443b06c6a25f46464fef3f1c2a249a3ac1d 33d56fac1b414a5858c6c5e26b0fa32e1f44c3bf
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Sat Nov 13 19:11:22 2010 +0100

    Merge commit 'upstream/2.0.0'


-- 
swami packaging