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

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

Imported Upstream version 3.99.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: 27d6fb74a23f561b06de91437d2e871d67d89494
X-Git-Newrev: e048b85a1b111982ced4f9e52936834dcf902e57

The following commit has been merged in the master branch:
commit 160203973e426458494efaaa692d35ed48bef5be
Merge: 40a29f433d14ef31d55286566bf715ca75006714 edf58aa03e528965bd03774181f8dbe7a20c1b72
Author: Andres Mejia <amejia004 at gmail.com>
Date:   Sun Jan 29 10:37:12 2012 -0500

    Merge commit 'upstream/3.99.4+repack1'


-- 
lame packaging