merge commits of 2.2.1 to public 32/13532/1 accepted/tizen/mobile tizen accepted/tizen/20131209.172553 submit/tizen/20131209.105054
-rwxr-xr-x 6672 CMakeLists.txt
-rw-r--r-- 11358 LICENSE.APLv2.0
-rw-r--r-- 211 NOTICE
drwxr-xr-x - inc
-rw-r--r-- 66 osp-media.manifest
-rwxr-xr-x 269 osp-media.pc.in
drwxr-xr-x - packaging
drwxr-xr-x - src