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

Trivial merge