Merge branch 'master' into conference

sflphone-common/configure.ac

sflphone-common/globals.mak

sflphone-common/libs/dbus-c++/src/Makefile.am

sflphone-common/libs/pjproject/aconfigure

sflphone-common/libs/pjproject/aconfigure.ac

sflphone-common/libs/pjproject/third_party/build/Makefile

...common/libs/pjproject/third_party/build/milenage/Makefile

...libs/pjproject/third_party/build/milenage/libmilenage.dsp

...libs/pjproject/third_party/build/milenage/libmilenage.vcp

...s/pjproject/third_party/build/milenage/libmilenage.vcproj

...ne-common/libs/pjproject/third_party/ilbc/FrameClassify.c

...ne-common/libs/pjproject/third_party/ilbc/FrameClassify.h

sflphone-common/libs/pjproject/third_party/ilbc/LPCdecode.c

sflphone-common/libs/pjproject/third_party/ilbc/LPCdecode.h

sflphone-common/libs/pjproject/third_party/ilbc/LPCencode.c

sflphone-common/libs/pjproject/third_party/ilbc/LPCencode.h

...-common/libs/pjproject/third_party/ilbc/StateConstructW.c

...-common/libs/pjproject/third_party/ilbc/StateConstructW.h

...one-common/libs/pjproject/third_party/ilbc/StateSearchW.c

...one-common/libs/pjproject/third_party/ilbc/StateSearchW.h