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

[alessio at users.alioth.debian.org]

Imported Upstream version 0.6.0~rc7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 705bf75a43ae509977c421d8e5692c445e29b14a
X-Git-Newrev: 8ea69bf2d2399d7e17592ca57ca85c91ffb6b216

The following commit has been merged in the master branch:
commit 8ea69bf2d2399d7e17592ca57ca85c91ffb6b216
Merge: 705bf75a43ae509977c421d8e5692c445e29b14a 6da34dceccd82f8589de74eab8d57ef800fc5425
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Nov 24 17:42:23 2010 +0100

    Merge commit 'upstream/0.6.0_rc7'


-- 
xjadeo packaging