Merge branch 'master' of aubio.org:/git/aubio/aubio
authorPaul Brossier <piem@piem.org>
Tue, 22 Nov 2011 04:36:42 +0000 (20:36 -0800)
committerPaul Brossier <piem@piem.org>
Tue, 22 Nov 2011 04:36:42 +0000 (20:36 -0800)

Trivial merge