[gnoduino: 150/237] Merge pull request #41 from chiva/patch-1

[Lucian Langa <lucilanga src gnome org>]

commit 5a8882b7857130445bee052c014bb6d4b2475633
Merge: 8061c93 cb1a432
Author: David A. Mellis <d mellis arduino cc>
Date:   Mon Oct 10 08:56:15 2011 -0700

    Merge pull request #41 from chiva/patch-1
    
    Added USBasp to programmers list

 arduino/programmers.txt |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---