[SCM] sooperlooper/master: Merge branch 'upstream'

[alessio at users.alioth.debian.org]

Imported Upstream version 1.6.14+dfsg
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 1ba8d155e264001838d62ccfb06536509428ff2b
X-Git-Newrev: 83de42f33c52ebf1aa5a99c1eea20c71195da3ab

The following commit has been merged in the master branch:
commit 83de42f33c52ebf1aa5a99c1eea20c71195da3ab
Merge: 1ba8d155e264001838d62ccfb06536509428ff2b 64829bb79ae13490457622d90ea21349f3a0be92
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon May 9 01:27:26 2011 +0200

    Merge branch 'upstream'


-- 
sooperlooper packaging