Merge branch 'ehofman/sound'

Changed include of SGQuat.hxx to SGMath.hxx in
sound/sample_openal.cxx; somehow this happened in a merge commit when
the sound branch was merged to next.

diff --cc simgear/sound/sample_openal.cxx
index 52eaea184435b00a3b4e27a5803e3cfbc1ecb526,6a4f7cb92dbe2603b35e5a5cb7d42c67a08920d3..16291d7da918bd15dd51c35853710e86cf2e04ec
--- 1/simgear/sound/sample_openal.cxx
--- 2/simgear/sound/sample_openal.cxx
+++ b/simgear/sound/sample_openal.cxx
@@@ -24,20 -26,14 +26,14 @@@
  #  include <simgear_config.h>
  #endif
  
- #if defined( __APPLE__ )
- # define AL_ILLEGAL_ENUM AL_INVALID_ENUM
- # define AL_ILLEGAL_COMMAND AL_INVALID_OPERATION
- # include <OpenAL/al.h>
- # include <OpenAL/alut.h>
- #else
- # include <AL/al.h>
- # include <AL/alut.h>
- #endif
+ #include <stdlib.h>   // rand()
  
  #include <simgear/debug/logstream.hxx>
- #include <simgear/misc/sg_path.hxx>
  #include <simgear/structure/exception.hxx>
 -#include <simgear/math/SGQuat.hxx>
+ #include <simgear/misc/sg_path.hxx>
++#include <simgear/math/SGMath.hxx>
  
+ #include "soundmgr_openal.hxx"
  #include "sample_openal.hxx"