merge with master
-rw-r--r-- 143 AUTHORS
-rw-r--r-- 4834 CMakeLists.txt
-rw-r--r-- 11358 LICENSE.APLv2
-rwxr-xr-x 217 NOTICE
drwxr-xr-x - inc
-rw-r--r-- 66 osp-content.manifest
-rwxr-xr-x 271 osp-content.pc.in
drwxr-xr-x - packaging
drwxr-xr-x - src