Merge aubio.org:/git/aubio/aubio into develop
authorPaul Brossier <piem@piem.org>
Sun, 3 Mar 2013 19:15:29 +0000 (14:15 -0500)
committerPaul Brossier <piem@piem.org>
Sun, 3 Mar 2013 19:15:29 +0000 (14:15 -0500)

Trivial merge