Merge branch 'master' into im

sflphone-common/configure.ac

sflphone-common/globals.mak

sflphone-common/src/Makefile.am

sflphone-common/src/audio/Makefile.am

sflphone-common/src/audio/audiortp/AudioRtpSession.h

sflphone-common/src/audio/echocancel.cpp

sflphone-common/src/audio/jitterbuf.cpp

sflphone-common/src/audio/jitterbuf.h

sflphone-common/src/audio/mainbuffer.cpp

sflphone-common/src/audio/mainbuffer.h

sflphone-common/src/audio/recordable.cpp

sflphone-common/src/audio/recordable.h

sflphone-common/src/call.cpp

sflphone-common/src/call.h

sflphone-common/src/conference.cpp

sflphone-common/src/conference.h

sflphone-common/src/eventthread.h

sflphone-common/src/managerimpl.cpp

sflphone-common/src/managerimpl.h

sflphone-common/src/plug-in/audiorecorder/Makefile.am