Merge aubio.org:/git/aubio/aubio
authorPaul Brossier <piem@piem.org>
Mon, 2 May 2011 10:38:00 +0000 (12:38 +0200)
committerPaul Brossier <piem@piem.org>
Mon, 2 May 2011 10:38:00 +0000 (12:38 +0200)

Trivial merge