Merge branch 'pitchyinfft' into develop
authorPaul Brossier <piem@piem.org>
Mon, 18 Mar 2013 15:34:01 +0000 (10:34 -0500)
committerPaul Brossier <piem@piem.org>
Mon, 18 Mar 2013 15:34:01 +0000 (10:34 -0500)

Trivial merge