Merge branch 'synth' into develop
authorPaul Brossier <piem@piem.org>
Fri, 22 Mar 2013 17:22:12 +0000 (12:22 -0500)
committerPaul Brossier <piem@piem.org>
Fri, 22 Mar 2013 17:22:12 +0000 (12:22 -0500)

Trivial merge