Merge branch 'master' of piem.org:/git/aubio/aubio
authorPaul Brossier <piem@piem.org>
Sat, 7 Jan 2012 02:53:32 +0000 (20:53 -0600)
committerPaul Brossier <piem@piem.org>
Sat, 7 Jan 2012 02:53:32 +0000 (20:53 -0600)

Trivial merge