[avrdude: 5/5] Merge branch 'update/avrdude-5.11.1'

[Hans Ulrich Niedermann]

commit 04f283614b91a9eba343c8a292f48d34a037c9c1
Merge: 2177bd1 b79f3d1
Author: Hans Ulrich Niedermann <hun at n-dimensional.de>
Date:   Sun Jan 22 20:12:58 2012 +0100

    Merge branch 'update/avrdude-5.11.1'

 .gitignore   |    3 ++-
 avrdude.spec |   12 +++++++++---
 sources      |    2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)
---