Merge branch_beta3 onto the mainline.

Monty

svn path=/trunk/vorbis/; revision=990