Merge pure into eterwine

Conflicts:
	configure

diff --cc configure
index ab6867cce9400ebc5182c2679c79692b10522580,5842ed04cf2b0f5c6f7f8f605dd9aadfa1acfc68..b7bb95c09c053f4df80a4dd7cb490dc42390eccb
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -1,6 -1,6 +1,6 @@@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.65 for Wine 1.3.16.
 -# Generated by GNU Autoconf 2.67 for Wine 1.3.17.
++# Generated by GNU Autoconf 2.65 for Wine 1.3.17.
  #
  # Report bugs to <wine-devel@winehq.org>.
  #
@@@ -1590,8 -1589,8 +1590,8 @@@ f
  test -n "$ac_init_help" && exit $ac_status
  if $ac_init_version; then
    cat <<\_ACEOF
- Wine configure 1.3.16
+ Wine configure 1.3.17
 -generated by GNU Autoconf 2.67
 +generated by GNU Autoconf 2.65
  
  Copyright (C) 2010 Free Software Foundation, Inc.
  This configure script is free software; the Free Software Foundation
@@@ -2139,8 -2107,8 +2139,8 @@@ cat >config.log <<_ACEO
  This file contains any messages produced by compilers while
  running configure, to aid debugging if configure makes a mistake.
  
- It was created by Wine $as_me 1.3.16, which was
+ It was created by Wine $as_me 1.3.17, which was
 -generated by GNU Autoconf 2.67.  Invocation command line was
 +generated by GNU Autoconf 2.65.  Invocation command line was
  
    $ $0 $@
  
@@@ -16252,8 -16106,8 +16252,8 @@@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wr
  # report actual input values of CONFIG_FILES etc. instead of their
  # values after options handling.
  ac_log="
- This file was extended by Wine $as_me 1.3.16, which was
+ This file was extended by Wine $as_me 1.3.17, which was
 -generated by GNU Autoconf 2.67.  Invocation command line was
 +generated by GNU Autoconf 2.65.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
@@@ -16323,8 -16177,8 +16323,8 @@@ _ACEO
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
  ac_cs_version="\\
- Wine config.status 1.3.16
+ Wine config.status 1.3.17
 -configured by $0, generated by GNU Autoconf 2.67,
 +configured by $0, generated by GNU Autoconf 2.65,
    with options \\"\$ac_cs_config\\"
  
  Copyright (C) 2010 Free Software Foundation, Inc.

diff --cc dlls/msi/action.c
Simple merge