Merge branch 'master' of piem.org:/git/aubio/aubio
authorPaul Brossier <piem@piem.org>
Fri, 6 Jan 2012 22:59:29 +0000 (16:59 -0600)
committerPaul Brossier <piem@piem.org>
Fri, 6 Jan 2012 22:59:29 +0000 (16:59 -0600)

Trivial merge