(part of patch #8176: butterfly.c (AVR109 protocol implementation) clean-up and bug-fixing)

* butterfly.c (butterfly_page_erase): Add dummy function to avoid
segfault when writing to EEPROM.




git-svn-id: http://svn.savannah.nongnu.org/svn/avrdude/trunk@1227 81a1dc3b-b13d-400b-aceb-764788c761c2
Submitted by Stephen Roe:
patch #7710: usb_libusb: Check VID/PID before opening device
* usb_libusb.c (usbdev_open): Swap the sequence of verifying the
VID:PID, and opening the device.



git-svn-id: http://svn.savannah.nongnu.org/svn/avrdude/trunk@1228 81a1dc3b-b13d-400b-aceb-764788c761c2
Merge branch 'master' into avr109