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

[alessio at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 702cd1a49506d29bc0677188b11d921cca0ecee9
Merge: 2cfb71be92a116b633edfb9d4009d34dc1e7cf8e 87abe2c3672a977f3f24d0362c94031b509c084d
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Nov 10 18:27:43 2010 +0100

    Merge commit 'upstream/0.6.0_rc2'


-- 
xjadeo packaging