From: Thomas Jarosch <thomas.jarosch@intra2net.com>
Date: Fri, 20 May 2011 14:10:11 +0000 (+0200)
Subject: Merge branch 'eeprom-new'
X-Git-Tag: v1.0rc1~133
X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=commitdiff_plain;h=f276fe667f966ba9e39ec67c64443e91aec479f0

Merge branch 'eeprom-new'

Conflicts:
	examples/stream_test.c
---

f276fe667f966ba9e39ec67c64443e91aec479f0