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

[alessio at users.alioth.debian.org]

Imported Upstream version 1.3.0.dfsg0
Imported Upstream version 1.3.0
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: 88685437e7d7d01efa4be7f9847f7f0b2e6d5aa5
X-Git-Newrev: 8c10107795134d1273cd47969d4000381cf51400

The following commit has been merged in the master branch:
commit 8c10107795134d1273cd47969d4000381cf51400
Merge: 88685437e7d7d01efa4be7f9847f7f0b2e6d5aa5 7f30e5b387b696a3759506e316c9a1f2f7c32a66
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri May 13 12:42:25 2011 +0200

    Merge commit 'upstream/1.3.0.dfsg0'


-- 
ois packaging