Merge klauss' vorbis multiarch patch for cmake
Authored by: cellsafemode 2013-02-26
Parent: [r13533]
Child: [r13535]