Merge 0.9->0.10

diff --cc Makefile
Simple merge

diff --cc configure
index 040ff648a54a2e01190f042ad0c85e349e5d31e8,c27517fc9e8de60a0d3358f730d6933b99310954..d669d3a8ebccc686a42376de76abcf785065cfab
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -128,11 -132,14 +131,14 @@@ d
          LUA_SUFFIX_SET=yes
          LUA_DIR=/usr/local
          LUA_DIR_SET=yes
 -        fi
 -        if [ "$OSTYPE" = "openbsd" ]
 -        then LUA_INCDIR="/usr/local/include";
 -        fi
 +      fi
 +      if [ "$OSTYPE" = "openbsd" ]; then
 +        LUA_INCDIR="/usr/local/include";
 +      fi
        ;;
+    --libdir=*)
+       LIBDIR="$value"
+       ;;
     --datadir=*)
        DATADIR="$value"
        DATADIR_SET=yes