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

[alessio at users.alioth.debian.org]

Imported Upstream version 0.6.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: fa33cda63a5cd47093833f2a6a10667b1ea19318
X-Git-Newrev: 053c39fb1f6f97618e72650fae5820df0a42b25a

The following commit has been merged in the master branch:
commit 053c39fb1f6f97618e72650fae5820df0a42b25a
Merge: fa33cda63a5cd47093833f2a6a10667b1ea19318 0887df821ff6e60391edb5958f31f2b0808c1c1d
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Jul 9 10:59:26 2011 +0200

    Merge commit 'upstream/0.6.0'


-- 
xjadeo packaging