[SCM] xjadeo/master: Merge commit 'upstream/0.6.1'

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

Imported Upstream version 0.6.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: 2ca4d20a703313dd0d77c139f4f10c849ce0943f
X-Git-Newrev: ccca21d9b392c6cba0f6190e1fc5bd20897cb343

The following commit has been merged in the master branch:
commit ccca21d9b392c6cba0f6190e1fc5bd20897cb343
Merge: 2ca4d20a703313dd0d77c139f4f10c849ce0943f 6156dd2a381b9eb9bc03b1359914f7954a796cfb
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Fri Jul 15 22:02:13 2011 +0200

    Merge commit 'upstream/0.6.1'


-- 
xjadeo packaging