Resolve merge conflicts
-rw-r--r-- 222 .gitignore
-rw-r--r-- 9 AUTHORS
-rw-r--r-- 331 CommonAPI-DBus-uninstalled.pc.in
-rw-r--r-- 313 CommonAPI-DBus.pc.in
-rw-r--r-- 16726 LICENSE
-rwxr-xr-x 1093 LICENSE_MurmurHash
-rwxr-xr-x 29246 LICENSE_dbus_patch
-rw-r--r-- 7055 Makefile.am
-rwxr-xr-x 4493 README
-rw-r--r-- 13462 README.html
-rw-r--r-- 4061 aminclude.am
-rw-r--r-- 2836 configure.ac
-rw-r--r-- 10132 dbus-DBusMessage-add-support-for-custom-marshaling.patch
-rw-r--r-- 76652 doxygen.cfg
drwxr-xr-x - m4
drwxr-xr-x - src