Merge branch 'master' of github.com:arduino/Arduino into LUFA_bootloader

build/build.xml

@@ -573,6 +573,7 @@
       <tarfileset dir="../" 
 		  prefix="arduino-${version}" 
 		  excludes="**/*.tgz,
+			     **/*.bz2,
 			     **/macosx/,
 			     **/windows/,
 			     **/work/,

build/shared/lib/preferences.txt

@@ -255,3 +255,8 @@ serial.databits=8
 serial.stopbits=1
 serial.parity=N
 serial.debug_rate=9600
+
+# I18 Preferences
+
+# default chosen language (none for none)
+editor.languages.current =