Merge branch 'upstream' into tizen

Merge branch 'upstream' into tizen

Conflicts:
	AUTHORS
	COPYING
	ChangeLog
	INSTALL
	Makefile.am
	Makefile.in
	README
	README.windows.txt
	TODO
	config.rpath
	configure.ac
	doc/Doxyfile.in
	doc/Makefile.am
	doc/Makefile.in
	doc/examples.h
	doc/mainpage.h
	examples/Makefile.am
	examples/Makefile.in
	examples/albumart.c
	examples/albums.c
	examples/common.h
	examples/connect.c
	examples/connect.h
	examples/delfile.c
	examples/detect.c
	examples/emptyfolders.c
	examples/files.c
	examples/filetree.c
	examples/folders.c
	examples/format.c
	examples/getfile.c
	examples/getplaylist.c
	examples/newfolder.c
	examples/newplaylist.c
	examples/pathutils.c
	examples/pathutils.h
	examples/playlists.c
	examples/reset.c
	examples/sendfile.c
	examples/sendtr.c
	examples/thumb.c
	examples/tracks.c
	examples/trexist.c
	examples/util.c
	examples/util.h
	libmtp.pc
	libmtp.pc.in
	libmtp.sh
	libmtp.sh.in
	m4/byteorder.m4
	m4/iconv.m4
	m4/stdint.m4
	src/Makefile.am
	src/README
	src/_stdint.h
	src/chdk_live_view.h
	src/chdk_ptp.h
	src/device-flags.h
	src/gphoto2-endian.h
	src/libmtp.c
	src/libmtp.h
	src/libmtp.h.in
	src/libmtp.sym
	src/libopenusb1-glue.c
	src/libusb-glue.c
	src/libusb-glue.h
	src/libusb1-glue.c
	src/mtpz.c
	src/mtpz.h
	src/playlist-spl.c
	src/playlist-spl.h
	src/ptp-pack.c
	src/ptp.c
	src/ptp.h
	src/unicode.c
	src/unicode.h
	src/util.c
	src/util.h
	util/Makefile.am
	util/Makefile.in
	util/mtp-hotplug.c
	util/mtp-probe.c

Change-Id: I412b7e209ad6ba836c3ec00ba76501625fd927fc