ref: 011402a252450a6883f109a86e5dd7e24aa0d3a0
parent: 93839b636d0a1801950bf1ddf52e52cc12b6391a
parent: 7d50a792c1a90425e1972a1cfea2d0d61416297b
author: Jean-Marc Valin <jean-marc.valin@octasic.com>
date: Thu Apr 28 11:51:30 EDT 2011
Merge commit 'silk-repo/master'