Merge commit 'silk-repo/master'
authorJean-Marc Valin <jean-marc.valin@octasic.com>
Thu, 28 Apr 2011 19:51:30 +0000 (15:51 -0400)
committerJean-Marc Valin <jean-marc.valin@octasic.com>
Thu, 28 Apr 2011 19:51:30 +0000 (15:51 -0400)

Trivial merge