Merge branch 'master' into neon

Conflicts:
	testsuite/Makefile.am

diff --cc testsuite/Makefile.am
index 776501a,05aefe4..051ca05
--- 1/testsuite/Makefile.am
--- 2/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@@ -18,33 -18,20 +18,33 @@@ orcbin_PROGRAMS = $(TESTS) generate_xml
  
  CLEANFILES = temp-orc-test-*
  
 +TESTS += compile_opcodes_sys_neon \
 +      compile_opcodes_float_neon \
 +      compile_opcodes_pixel_neon \
 +      compile_opcodes_sys_c64x
 +orcbin_PROGRAMS += compile_opcodes_sys_neon \
 +      compile_opcodes_float_neon \
 +      compile_opcodes_pixel_neon \
 +      compile_opcodes_sys_c64x
 +
  AM_CFLAGS = $(ORC_CFLAGS)
- LIBS = $(ORC_LIBS) $(top_builddir)/orc-test/liborc-test-0.3.la
+ LIBS = $(ORC_LIBS) $(top_builddir)/orc-test/liborc-test-@ORC_MAJORMINOR@.la
  
  compile_opcodes_float_c_LDADD = \
-       $(top_builddir)/orc-float/liborc-float-0.3.la
+       $(top_builddir)/orc-float/liborc-float-@ORC_MAJORMINOR@.la
 +compile_opcodes_float_neon_LDADD = \
-       $(top_builddir)/orc-float/liborc-float-0.3.la
++      $(top_builddir)/orc-float/liborc-float-@ORC_MAJORMINOR@.la
  compile_opcodes_float_LDADD = \
-       $(top_builddir)/orc-float/liborc-float-0.3.la
+       $(top_builddir)/orc-float/liborc-float-@ORC_MAJORMINOR@.la
  exec_opcodes_float_LDADD = \
-       $(top_builddir)/orc-float/liborc-float-0.3.la
+       $(top_builddir)/orc-float/liborc-float-@ORC_MAJORMINOR@.la
  
  compile_opcodes_pixel_c_LDADD = \
-       $(top_builddir)/orc-pixel/liborc-pixel-0.3.la
+       $(top_builddir)/orc-pixel/liborc-pixel-@ORC_MAJORMINOR@.la
 +compile_opcodes_pixel_neon_LDADD = \
-       $(top_builddir)/orc-pixel/liborc-pixel-0.3.la
++      $(top_builddir)/orc-pixel/liborc-pixel-@ORC_MAJORMINOR@.la
  compile_opcodes_pixel_LDADD = \
-       $(top_builddir)/orc-pixel/liborc-pixel-0.3.la
+       $(top_builddir)/orc-pixel/liborc-pixel-@ORC_MAJORMINOR@.la
  exec_opcodes_pixel_LDADD = \
-       $(top_builddir)/orc-pixel/liborc-pixel-0.3.la
+       $(top_builddir)/orc-pixel/liborc-pixel-@ORC_MAJORMINOR@.la