Merge branch 'synth' into develop
authorPaul Brossier <piem@piem.org>
Sat, 23 Mar 2013 00:11:49 +0000 (19:11 -0500)
committerPaul Brossier <piem@piem.org>
Sat, 23 Mar 2013 00:11:49 +0000 (19:11 -0500)

Trivial merge