Merge commit 'greg/master'
authorJean-Marc Valin <jean-marc.valin@octasic.com>
Fri, 5 Jun 2009 21:21:17 +0000 (17:21 -0400)
committerJean-Marc Valin <jean-marc.valin@octasic.com>
Fri, 5 Jun 2009 21:21:17 +0000 (17:21 -0400)
commit52b4cb2166d8b9730132baaae1b72163812ccf92
treef24edd9474a0bf359413b5a279d72f775e9c6060
parent56522addc2d8e54a8b61740fdaa3237183e35514
parent2dd3d3258ab7b3acaccde06f384cd66572bd7e39
Merge commit 'greg/master'

Conflicts:
libcelt/celt.c
libcelt/celt.h
libcelt/celt.c
libcelt/celt.h