[SCM] sooperlooper/master: Merge commit 'upstream/1.6.18_dfsg0'

[alessio at users.alioth.debian.org]

Imported Upstream version 1.6.18~dfsg0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 8a3776d03f67c29dffed3545472199ba802f56ee
X-Git-Newrev: f736b738ac4cb68deb677453463644c0feeeaadf

The following commit has been merged in the master branch:
commit f736b738ac4cb68deb677453463644c0feeeaadf
Merge: 8a3776d03f67c29dffed3545472199ba802f56ee 0b5479f1864b40cc24ad2ea912a3c565f6d3348e
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Dec 5 01:44:18 2011 +0100

    Merge commit 'upstream/1.6.18_dfsg0'


-- 
sooperlooper packaging