[SCM] wavesurfer/master: Merge commit 'upstream/1.8.7'

[alessio at users.alioth.debian.org]

Imported Upstream version 1.8.7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 1839775203e3a8ccc467f7d8f2cdda0c3f598ff5
X-Git-Newrev: aa12676b7fff39401beaf819660c9ebaa0db9620

The following commit has been merged in the master branch:
commit ab5b82492e787eb5afd27f245969a588822fea50
Merge: 1839775203e3a8ccc467f7d8f2cdda0c3f598ff5 cc9bb906f37d07ebea921d0e36220e5f5162645e
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Oct 1 04:24:33 2010 +0200

    Merge commit 'upstream/1.8.7'


-- 
wavesurfer packaging