[avrdude: 17/20] Initial pseudo merge for dist-git setup

[Hans Ulrich Niedermann]

commit e8e590114ab61e0c2c0fa9f012cb325325f284e1
Merge: f1ee875 78d60e0
Author: Hans Ulrich Niedermann <hun at n-dimensional.de>
Date:   Wed Mar 2 22:30:59 2011 +0100

    Initial pseudo merge for dist-git setup
    
    This git merge exists to make future git merges much easier.

---