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

[alessio at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 165fc172dfa953f84e6f5cb10f3e241873fa0cf6
Merge: c1d21c16bf102714c55888ccd631f526c9095196 8e630a5f1335bccf6262baa646dff98293922a94
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Nov 11 16:08:54 2010 +0100

    Merge commit 'upstream/0.6.0_rc4'


-- 
xjadeo packaging