Merge in changes on MPEG_DEVEL branch. Actually done by back-mergeing from HEAD
into MPEG_DEVEL and then simply copying MPEG_DEVEL over.
Authored by: wackston2 2004-12-20
Parent: [r2541]
Child: [r2543]