[SCM] adplug/master: Merge commit 'upstream/2.2.1.dfsg1'

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

Imported Upstream version 2.2.1.dfsg1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 6771c32bb4209d4cb30befa53900de7595da9fb3
X-Git-Newrev: 02d1118765ca0237a4ceb05a5f2c7142a909ac84

The following commit has been merged in the master branch:
commit a545515d990b3dd265e58ce33bd0a6b3778ea08c
Merge: eb59d2d749ff924c9d6647f62db65f1699444f6c 16b980f5ef0072a6dc57e3435424088cc28031e5
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sun Sep 26 12:18:36 2010 -0400

    Merge commit 'upstream/2.2.1.dfsg1'


-- 
adplug packaging