Merge commit '407ee23a0fd8e0f00f7c41d83ae6fa4007ca229b'
-rw-r--r-- 35147 COPYING
-rw-r--r-- 7639 COPYING.LESSER
-rw-r--r-- 3073 Makefile
drwxr-xr-x - data
drwxr-xr-x - debian
-rw-r--r-- 1180 documentation.txt
drwxr-xr-x - psa_harmattan
drwxr-xr-x - src
-rw-r--r-- 0 welcome