Upstream sync
diff --git a/ChangeLog b/ChangeLog
index 7603ce8..94d6a9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-18  Linus Walleij <triad@df.lth.se>
+
+	* src/ptp.c: sync to upstream gPhoto source.
+	* src/ptp.h: dito.
+	
 2007-04-17  Richard Low <richard@wentnet.com>
 
 	* src/libusb-glue.c: new device