Merge from 2.2.1
-rw-r--r-- 1067 CMakeLists.txt
-rw-r--r-- 11358 LICENSE.APLv2
-rw-r--r-- 10998 LICENSE.Flora
-rw-r--r-- 547 NOTICE
drwxr-xr-x - inc
-rw-r--r-- 66 osp-net.manifest
-rwxr-xr-x 289 osp-net.pc.in
-rwxr-xr-x 289 osp-wifi.pc.in
drwxr-xr-x - packaging
drwxr-xr-x - src