Merge branch 'develop' of 192.168.0.101:projects/aubio/aubio into develop
authorPaul Brossier <piem@piem.org>
Fri, 27 Jul 2012 17:31:30 +0000 (11:31 -0600)
committerPaul Brossier <piem@piem.org>
Fri, 27 Jul 2012 17:31:30 +0000 (11:31 -0600)

Trivial merge