Merge branch 'develop' of 192.168.1.41:projects/aubio/aubio into develop
authorPaul Brossier <piem@piem.org>
Tue, 17 Jul 2012 21:00:34 +0000 (15:00 -0600)
committerPaul Brossier <piem@piem.org>
Tue, 17 Jul 2012 21:00:34 +0000 (15:00 -0600)

Trivial merge