arduino
Merge branch '@home' of https://github.com/una1veritas/Arduino into @home

Conflicts:
	.DS_Store
	libraries/glcd/Buildinfo.txt
	libraries/glcd/License.txt
	libraries/glcd/bitmaps/ArduinoIcon.h
	libraries/glcd/bitmaps/ArduinoIcon32.bmp
	libraries/glcd/bitmaps/ArduinoIcon32.h
	libraries/glcd/bitmaps/ArduinoIcon32x32.bmp
	libraries/glcd/bitmaps/ArduinoIcon32x32.h
	libraries/glcd/bitmaps/ArduinoIcon64x32.bmp
	libraries/glcd/bitmaps/ArduinoIcon64x32.h
	libraries/glcd/bitmaps/ArduinoIcon64x64.bmp
	libraries/glcd/bitmaps/ArduinoIcon64x64.h
	libraries/glcd/bitmaps/ArduinoIcon96x32.bmp
	libraries/glcd/bitmaps/ArduinoIcon96x32.h
	libraries/glcd/bitmaps/allBitmaps.h
	libraries/glcd/bitmaps/utils/Java/glcdMakeBitmap.jar
	libraries/glcd/bitmaps/utils/Java/glcdMakeBitmap.java
	libraries/glcd/bitmaps/utils/Readme.txt
	libraries/glcd/bitmaps/utils/data/ArduinoIcon.bmp
	libraries/glcd/bitmaps/utils/glcdMakeBitmap/glcdMakeBitmap.pde
	libraries/glcd/config/Modagm1264f_Manual_Config.h
	libraries/glcd/config/Modmt12232d_Manual_Config.h
	libraries/glcd/config/Modvk5121_Manual_Config.h
	libraries/glcd/config/ks0108-192x64_Panel.h
	libraries/glcd/config/ks0108_Arduino.h
	libraries/glcd/config/ks0108_Manual_Config.h
	libraries/glcd/config/ks0108_Mega.h
	libraries/glcd/config/ks0108_Panel.h
	libraries/glcd/config/ks0108_Sanguino.h
	libraries/glcd/config/ks0108_Teensy.h
	libraries/glcd/device/hd44102_Device.h
	libraries/glcd/device/ks0108_Device.h
	libraries/glcd/device/ks0713_Device.h
	libraries/glcd/device/mt12232d_Device.h
	libraries/glcd/device/sed1520_Device.h
	libraries/glcd/device/xxx_Device.h
	libraries/glcd/doc/GLCD_Documentation.pdf
	libraries/glcd/doc/GLCDref.htm
	libraries/glcd/doc/html/Coordinates.jpg
	libraries/glcd/doc/html/annotated.html
	libraries/glcd/doc/html/bc_s.png
	libraries/glcd/doc/html/classes.html
	libraries/glcd/doc/html/classg_text-members.html
	libraries/glcd/doc/html/classg_text.html
	libraries/glcd/doc/html/classg_text.png
	libraries/glcd/doc/html/classglcd-members.html
	libraries/glcd/doc/html/classglcd.html
	libraries/glcd/doc/html/classglcd.png
	libraries/glcd/doc/html/classglcd___device-members.html
	libraries/glcd/doc/html/classglcd___device.html
	libraries/glcd/doc/html/classglcd___device.png
	libraries/glcd/doc/html/closed.png
	libraries/glcd/doc/html/doxygen.css
	libraries/glcd/doc/html/doxygen.png
	libraries/glcd/doc/html/ftv2blank.png
	libraries/glcd/doc/html/ftv2doc.png
	libraries/glcd/doc/html/ftv2folderclosed.png
	libraries/glcd/doc/html/ftv2folderopen.png
	libraries/glcd/doc/html/ftv2lastnode.png
	libraries/glcd/doc/html/ftv2link.png
	libraries/glcd/doc/html/ftv2mlastnode.png
	libraries/glcd/doc/html/ftv2mnode.png
	libraries/glcd/doc/html/ftv2node.png
	libraries/glcd/doc/html/ftv2plastnode.png
	libraries/glcd/doc/html/ftv2pnode.png
	libraries/glcd/doc/html/ftv2splitbar.png
	libraries/glcd/doc/html/ftv2vertline.png
	libraries/glcd/doc/html/functions.html
	libraries/glcd/doc/html/functions_func.html
	libraries/glcd/doc/html/functions_vars.html
	libraries/glcd/doc/html/glcdMakeBitmap.png
	libraries/glcd/doc/html/glcddiag1.jpg
	libraries/glcd/doc/html/glcddiag2.jpg
	libraries/glcd/doc/html/glcddiag3.jpg
	libraries/glcd/doc/html/glcddiag4.jpg
	libraries/glcd/doc/html/glcddiag5.jpg
	libraries/glcd/doc/html/glcddiag6.jpg
	libraries/glcd/doc/html/glcdlib.jpg
	libraries/glcd/doc/html/group__glcd__deprecated.html
	libraries/glcd/doc/html/group__glcd__enum.html
	libraries/glcd/doc/html/hierarchy.html
	libraries/glcd/doc/html/index.html
	libraries/glcd/doc/html/installdox
	libraries/glcd/doc/html/jquery.js
	libraries/glcd/doc/html/ks0108_Panel_A.gif
	libraries/glcd/doc/html/ks0108_Panel_A_WiringPic.jpg
	libraries/glcd/doc/html/ks0108_Panel_B.gif
	libraries/glcd/doc/html/ks0108lib.jpg
	libraries/glcd/doc/html/modules.html
	libraries/glcd/doc/html/nav_f.png
	libraries/glcd/doc/html/nav_h.png
	libraries/glcd/doc/html/navtree.css
	libraries/glcd/doc/html/navtree.js
	libraries/glcd/doc/html/open.png
	libraries/glcd/doc/html/page__additional_resources.html
	libraries/glcd/doc/html/page__bitmaps.html
	libraries/glcd/doc/html/page__fonts.html
	libraries/glcd/doc/html/page__fonts_bitmaps.html
	libraries/glcd/doc/html/page__g_l_c_d_methods.html
	libraries/glcd/doc/html/page__g_l_c_d_object.html
	libraries/glcd/doc/html/page__g_l_c_ddiags.html
	libraries/glcd/doc/html/page_arduino_print.html
	libraries/glcd/doc/html/page_configuring.html
	libraries/glcd/doc/html/page_coordinates.html
	libraries/glcd/doc/html/page_g_text_object.html
	libraries/glcd/doc/html/page_ks0108_family.html
	libraries/glcd/doc/html/page_ks0108_libmigrate.html
	libraries/glcd/doc/html/page_ks0108config.html
	libraries/glcd/doc/html/page_ks0108sketch.html
	libraries/glcd/doc/html/page_pindefines.html
	libraries/glcd/doc/html/page_sed1520_family.html
	libraries/glcd/doc/html/page_troubleshoot.html
	libraries/glcd/doc/html/page_wiring.html
	libraries/glcd/doc/html/panel_ks0108.jpg
	libraries/glcd/doc/html/panel_vk5121.jpg
	libraries/glcd/doc/html/resize.js
	libraries/glcd/doc/html/search/all_62.html
	libraries/glcd/doc/html/search/all_63.html
	libraries/glcd/doc/html/search/all_64.html
	libraries/glcd/doc/html/search/all_65.html
	libraries/glcd/doc/html/search/all_66.html
	libraries/glcd/doc/html/search/all_67.html
	libraries/glcd/doc/html/search/all_68.html
	libraries/glcd/doc/html/search/all_69.html
	libraries/glcd/doc/html/search/all_70.html
	libraries/glcd/doc/html/search/all_72.html
	libraries/glcd/doc/html/search/all_73.html
	libraries/glcd/doc/html/search/all_77.html
	libraries/glcd/doc/html/search/classes_67.html
	libraries/glcd/doc/html/search/close.png
	libraries/glcd/doc/html/search/functions_63.html
	libraries/glcd/doc/html/search/functions_64.html
	libraries/glcd/doc/html/search/functions_65.html
	libraries/glcd/doc/html/search/functions_66.html
	libraries/glcd/doc/html/search/functions_67.html
	libraries/glcd/doc/html/search/functions_69.html
	libraries/glcd/doc/html/search/functions_70.html
	libraries/glcd/doc/html/search/functions_72.html
	libraries/glcd/doc/html/search/functions_73.html
	libraries/glcd/doc/html/search/functions_77.html
	libraries/glcd/doc/html/search/mag_sel.png
	libraries/glcd/doc/html/search/nomatches.html
	libraries/glcd/doc/html/search/search.css
	libraries/glcd/doc/html/search/search.js
	libraries/glcd/doc/html/search/search_l.png
	libraries/glcd/doc/html/search/search_m.png
	libraries/glcd/doc/html/search/search_r.png
	libraries/glcd/doc/html/search/variables_62.html
	libraries/glcd/doc/html/search/variables_63.html
	libraries/glcd/doc/html/search/variables_68.html
	libraries/glcd/doc/html/search/variables_72.html
	libraries/glcd/doc/html/search/variables_77.html
	libraries/glcd/doc/html/tab_a.png
	libraries/glcd/doc/html/tab_b.png
	libraries/glcd/doc/html/tab_h.png
	libraries/glcd/doc/html/tab_s.png
	libraries/glcd/doc/html/tabs.css
	libraries/glcd/examples/BigNums/BigNums.pde
	libraries/glcd/examples/GLCD_BigDemo/AnalogClock.cpp
	libraries/glcd/examples/GLCD_BigDemo/AnalogClock.h
	libraries/glcd/examples/GLCD_BigDemo/BigDemo.h
	libraries/glcd/examples/GLCD_BigDemo/GLCD_BigDemo.pde
	libraries/glcd/examples/GLCD_BigDemo/Rocket.pde
	libraries/glcd/examples/GLCD_BigDemo/bitmaps.h
	libraries/glcd/examples/GLCD_BigDemo/clockFace.pde
	libraries/glcd/examples/GLCD_BigDemo/life.pde
	libraries/glcd/examples/GLCDdemo/GLCDdemo.pde
	libraries/glcd/examples/GLCDdiags/GLCDdiags.pde
	libraries/glcd/examples/HelloWorld/HelloWorld.pde
	libraries/glcd/examples/Rocket/Rocket.pde
	libraries/glcd/examples/Rocket/bitmaps.h
	libraries/glcd/examples/Serial2GLCD/Serial2GLCD.pde
	libraries/glcd/examples/clockFace/AnalogClock.cpp
	libraries/glcd/examples/clockFace/AnalogClock.h
	libraries/glcd/examples/clockFace/clockFace.pde
	libraries/glcd/examples/ks0108example/ks0108example.pde
	libraries/glcd/examples/life/life.pde
	libraries/glcd/fonts/Arial14.h
	libraries/glcd/fonts/Arial_bold_14.h
	libraries/glcd/fonts/Corsiva_12.h
	libraries/glcd/fonts/SystemFont5x7.h
	libraries/glcd/fonts/Verdana_digits_24.h
	libraries/glcd/fonts/allFonts.h
	libraries/glcd/fonts/fixednums15x31.h
	libraries/glcd/fonts/fixednums7x15.h
	libraries/glcd/fonts/fixednums8x16.h
	libraries/glcd/gText.cpp
	libraries/glcd/glcd.cpp
	libraries/glcd/glcd.h
	libraries/glcd/glcd_Buildinfo.h
	libraries/glcd/glcd_Config.h
	libraries/glcd/glcd_Device.cpp
	libraries/glcd/include/Streaming.h
	libraries/glcd/include/arduino_io.h
	libraries/glcd/include/avrio.h
	libraries/glcd/include/delay.h
	libraries/glcd/include/gText.h
	libraries/glcd/include/glcd_Deprecated.h
	libraries/glcd/include/glcd_Device.h
	libraries/glcd/include/glcd_errno.h
	libraries/glcd/include/glcd_io.h
	libraries/glcd/readme.txt