[SCM] lame/master: Merge commit 'upstream/3.98.4+repack1'

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

Imported Upstream version 3.98.4+repack1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 6ec3f3293d962712a83921dc705a92c44554e985
X-Git-Newrev: 61097e0e7ce1ddaf900ca77efea99a1775e84fdb

The following commit has been merged in the master branch:
commit a0ed884a3160b2bc153a49f1ad9ef5f93002ac4a
Merge: 6ec3f3293d962712a83921dc705a92c44554e985 7cb14c03cabaa74e452899e7899c7e7c1b4fb6dd
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Tue Jul 26 20:27:22 2011 -0400

    Merge commit 'upstream/3.98.4+repack1'
    
    Conflicts:
    	config.guess
    	config.sub
    	debian/changelog
    	debian/compat
    	debian/control
    	debian/copyright
    	debian/rules


-- 
lame packaging