Merge branch 'master' into branch-1.5

diff --combined configure.ac
index a6a9d3c5234f6537af8c8e1d783b6fc1e0ff5f85,9f2cb0d7db00ed220b612d8b374d315b7f73e106..3062b13b8c080ad3a871e81b169c020ce069276f
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -18,7 -18,7 +18,7 @@@ dn
  dnl Process this file with autoconf to create configure.
  
  AC_PREREQ(2.57)
 -AC_INIT([altos], 1.4.9.3)
 +AC_INIT([altos], 1.5)
  AC_CONFIG_SRCDIR([src/kernel/ao.h])
  AM_INIT_AUTOMAKE([foreign dist-bzip2])
  AM_MAINTAINER_MODE
@@@ -497,6 -497,14 +497,14 @@@ esa
        
  AM_CONDITIONAL([MULTI_ARCH], [test x$MULTI_ARCH = xyes])
  
+ AC_ARG_ENABLE([install-shared-mime-info],
+             [AS_HELP_STRING([--disable-install-shared-mime-info],
+                             [disable installing shared mime info files (default=yes)])],
+             [INSTALL_SHARED_MIME_INFO=$enableval],
+             [INSTALL_SHARED_MIME_INFO=yes])
+ 
+ AM_CONDITIONAL([INSTALL_SHARED_MIME_INFO], [test x$INSTALL_SHARED_MIME_INFO = xyes])
+ 
  AC_OUTPUT([
  Makefile
  src/Makedefs
@@@ -557,6 -565,7 +565,7 @@@ echo "    Android support.............
  echo "    STlink support..............: ${HAVE_STLINK}"
  echo "    Local pdclib................: ${HAVE_PDCLIB}"
  echo "    i386 and amd64 libaltos.....: ${MULTI_ARCH}"
+ echo "    install shared mime info....: ${INSTALL_SHARED_MIME_INFO}"
  echo ""
  echo "  Java"
  echo "    freetts.....................: ${FREETTS}"