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

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

Imported Upstream version 3.99.3+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: e0112d934f1737be52a89a14021f3477d38be845
X-Git-Newrev: bbc63174b2cc9193639e4927c7289cba3cd2c18b

The following commit has been merged in the master branch:
commit 6f3a3a930ec5fcdff5e114d251e7389471bdf6e7
Merge: d7fcb30951ff67d40443262e66256526d324c0a0 50363501561415f5670e6715a91915f63431476d
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sun Dec 11 09:38:03 2011 -0500

    Merge commit 'upstream/3.99.3+repack1'
    
    Conflicts:
    	lame.spec


-- 
lame packaging