Merge branch 'stereo'
authorJean-Marc Valin <Jean-Marc.Valin@csiro.au>
Mon, 2 Jun 2008 03:14:56 +0000 (13:14 +1000)
committerJean-Marc Valin <Jean-Marc.Valin@csiro.au>
Mon, 2 Jun 2008 03:14:56 +0000 (13:14 +1000)

Trivial merge