Merge branch 'master' of git+ssh://aubio.org/git/aubio/aubio into mono
authorPaul Brossier <piem@piem.org>
Sat, 5 Dec 2009 01:06:42 +0000 (02:06 +0100)
committerPaul Brossier <piem@piem.org>
Sat, 5 Dec 2009 01:06:42 +0000 (02:06 +0100)

Trivial merge