Merge remote-tracking branch 'origin/master' into gsoc2012-scilab

Conflicts:
	.gitignore
	.travis.yml
	configure.ac

.gitignore

@@ -67,6 +67,7 @@ CCache/config.h
 CCache/config.log
 CCache/config.status
 Examples/Makefile
+Examples/d/example.mk
 Examples/guile/Makefile
 Examples/test-suite/*/Makefile
 Examples/xml/Makefile
@@ -137,6 +138,7 @@ Examples/test-suite/uffi/*/
 
 # Octave generated files
 swigexample*.oct
+Examples/test-suite/octave/*.oct
 
 # Python generated files, based on:
 #   https://github.com/github/gitignore/blob/master/Python.gitignore
@@ -145,10 +147,11 @@ swigexample*.oct
 /__pycache__/
 
 # Scilab generated files
-builder.sce
 loader.sce
-cleaner.sce
-gw_*.c
+
+# Go generated files
+*.[5689]
+*_gc.c
 
 # Scratch directories
 Examples/scratch