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

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

Imported Upstream version 0.6.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 94695505e48f728fa52ac3430a1e6a7d7b8b156b
X-Git-Newrev: eb7fafc1b7b3fac537e556457cbf9ded851de615

The following commit has been merged in the master branch:
commit eb7fafc1b7b3fac537e556457cbf9ded851de615
Merge: 94695505e48f728fa52ac3430a1e6a7d7b8b156b ef91d867cd3e7b7c28af67a85a49e104a74f79b4
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Wed Oct 12 03:30:25 2011 +0200

    Merge commit 'upstream/0.6.2'


-- 
xjadeo packaging