Merge branch 'develop' of groseille:projects/aubio/aubio into develop
authorPaul Brossier <piem@piem.org>
Thu, 12 Jul 2012 08:00:19 +0000 (01:00 -0700)
committerPaul Brossier <piem@piem.org>
Thu, 12 Jul 2012 08:00:19 +0000 (01:00 -0700)

Trivial merge