Merge branch '4.0-dev' of ssh://git.code.sf.net/p/mingw/mingw-org-wsl into 4.0-dev

Conflicts:
	ChangeLog

diff --cc ChangeLog
index 2363877,d095d98..c719db9
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,30 +1,39 @@@
 +2013-05-15  Earnie Boyd  <earnie@users.sourceforge.net>
 +
 +      * .gitignore: Add nbproject folder.
++      * NEWS: Add note about the globbing change.
++
+ 2013-05-11  Keith Marshall  <keithmarshall@users.sourceforge.net>
+ 
+       Avoid a potential SIGSEGV crash on CRT start-up.
+ 
+       * src/libcrt/misc/glob.c (glob_signed): Check only for pointer
+       aliasing, when validating a glob_t signature; checking signature
+       content via an uninitialised pointer may segfault.
+ 
+       * src/libcrt/crt/init.c (__mingw_setargv): Call __mingw_glob()
+       directly, then set GLOB_APPEND for later calls; do not delegate to...
+       (do_glob): ...this; it uselessly attempted to set GLOB_APPEND on the
+       basis of an uninitialised counter.  Function now unused; delete it.
+ 
+ 2013-05-11  Keith Marshall  <keithmarshall@users.sourceforge.net>
+ 
+       Install non-executable files with proper attributes.
+ 
+       * Makefile.in (INSTALL_DATA): New macro; define it per AC_SUBST;
+       substitute it at point of use, as appropriate, in place of...
+       (INSTALL): ...this.
+ 
+ 2013-05-07  Keith Marshall  <keithmarshall@users.sourceforge.net>
+ 
+       Update build-aux submodule reference for SF host migration.
+ 
+       * .gitmodules (url): Relocate to git://git.code.sourceforge.net/p/
  
 +2013-04-10  Earnie Boyd  <earnie@users.sourceforge.net>
 +
 +      * Makefile.in: Add installation and delivery of library object files.
 +
  2013-04-09  Earnie Boyd  <earnie@users.sourceforge.net>
  
        * Makefile.in: Adjust distributed package names when RELEASE_STATUS is

diff --cc Makefile.in
Simple merge

diff --cc NEWS
index 385dd6d,385dd6d..f9aab6c
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -171,3 -171,3 +171,5 @@@ Provide implementations for IID_IGlobal
    CLSID_StdGlobalInterfaceTable.
  Added declaration and import of RegisterTypeLibForUser and
    UnRegisterTypeLibForUser.
++Resolve the shell globbing issue as describe in thread
++  http://thread.gmane.org/gmane.comp.gnu.mingw.user/38302