Merge branch 'silk_pitch_fix'
authorJean-Marc Valin <jmvalin@jmvalin.ca>
Thu, 21 Nov 2013 19:43:53 +0000 (14:43 -0500)
committerJean-Marc Valin <jmvalin@jmvalin.ca>
Thu, 21 Nov 2013 19:43:53 +0000 (14:43 -0500)

Trivial merge