Fix broken merge
Deal with GLib symbols that are too new
Deal with gtkdocize missing from nemomobile platform
Bump up version in the spec files
Add unpackaged files to spec files