Merge branch 'master' into tizen_2.1 2.1b_release accepted/tizen_2.1/20130425.022600 submit/tizen_2.1/20130424.223342
-rwxr-xr-x 53 AUTHORS
-rwxr-xr-x 3373 CMakeLists.txt
-rwxr-xr-x 10816 LICENSE.Flora
-rwxr-xr-x 214 NOTICE
drwxr-xr-x - data
drwxr-xr-x - debian
-rwxr-xr-x 149 org.tizen.lockscreen.manifest
-rwxr-xr-x 690 org.tizen.lockscreen.xml.in
drwxr-xr-x - packaging
drwxr-xr-x - po
drwxr-xr-x - src