merged from libmtp
added canon a2300is
added canon 2300is
added keepalive code
added sony alpha 350
added sony alpha 350
added nikon s620