Merge commit 'origin/master'
authorJean-Marc Valin <jean-marc.valin@octasic.com>
Mon, 8 Jun 2009 13:33:47 +0000 (09:33 -0400)
committerJean-Marc Valin <jean-marc.valin@octasic.com>
Mon, 8 Jun 2009 13:33:47 +0000 (09:33 -0400)

Trivial merge