Merge branch 'develop' of 192.168.1.16:projects/aubio/aubio into develop
authorPaul Brossier <piem@piem.org>
Sun, 15 Jul 2012 22:31:07 +0000 (16:31 -0600)
committerPaul Brossier <piem@piem.org>
Sun, 15 Jul 2012 22:31:07 +0000 (16:31 -0600)

Trivial merge