[SCM] ois/master: Merge commit 'upstream/1.3.0'

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

Imported Upstream version 1.3.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: 0f97d3eb60b088ac3c2bc88b0e0584aed0593c38
X-Git-Newrev: ceee8226725e0b0f439c63e1a4602be265d2cb5a

The following commit has been merged in the master branch:
commit c49d62452434fd264822610e8bccc9c372113cf6
Merge: 0f97d3eb60b088ac3c2bc88b0e0584aed0593c38 29dd21ecdf25652630fd1c103fec0836bb8fab2b
Author: Philippe Coval <rzr at gna.org>
Date:   Tue May 10 12:19:07 2011 +0200

    Merge commit 'upstream/1.3.0'


-- 
ois packaging