Merge from 2.2
-rwxr-xr-x 3145 CMakeLists.txt
-rw-r--r-- 11358 LICENSE.APLv2
-rw-r--r-- 227 NOTICE
drwxr-xr-x - inc
-rw-r--r-- 66 osp-telephony.manifest
-rw-r--r-- 271 osp-telephony.pc.in
drwxr-xr-x - packaging
drwxr-xr-x - src