[SCM] advene/master: Merge commit 'upstream/1.0'

[oaubert-guest at users.alioth.debian.org]

Imported Upstream version 1.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: 4e83b7dfb0da13daba7661b7b6a59da760770a48
X-Git-Newrev: 7e43a53ae30984aad9237fbc59cbf315efcde23c

The following commit has been merged in the master branch:
commit 283e0b48187dde97be1fbd95c13c8f39ac8c0e0e
Merge: 5572d8d19134ab7dc77dd54799b4f6d12c2099f5 9298ea6151428a12ac6f726724b5c639aec97fcd
Author: Olivier Aubert <olivier.aubert at liris.cnrs.fr>
Date:   Tue Dec 20 17:27:20 2011 +0100

    Merge commit 'upstream/1.0'


-- 
advene packaging