[gnoduino: 6/237] Merge branch 'master' into new-extension

[Lucian Langa <lucilanga src gnome org>]

commit b1705808287cd64bd63d0b5d683b6586b5e9f464
Merge: 4ba4fe6 f900bc8
Author: David A. Mellis <d mellis arduino cc>
Date:   Tue Feb 22 22:02:22 2011 -0500

    Merge branch 'master' into new-extension

 arduino/bootloaders/optiboot/optiboot.c            |    2 +-
 .../bootloaders/optiboot/optiboot_atmega328.hex    |   62 ++--
 .../bootloaders/optiboot/optiboot_atmega328.lst    |  462 ++++++++++----------
 3 files changed, 265 insertions(+), 261 deletions(-)
---