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

[alessio at users.alioth.debian.org]

Imported Upstream version 0.6.0~rc6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 2b9623acdeeb30fc40b366c5e8fda7f8676ff243
X-Git-Newrev: c76d54267e9c669f8f59c8ac2a919d03a30bc34f

The following commit has been merged in the master branch:
commit c76d54267e9c669f8f59c8ac2a919d03a30bc34f
Merge: 2b9623acdeeb30fc40b366c5e8fda7f8676ff243 5fb84365bc7edcfa99f5d3aa5cbdaf76938c5f46
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Nov 16 23:59:48 2010 +0100

    Merge commit 'upstream/0.6.0_rc6'


-- 
xjadeo packaging