Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Sat, 30 Mar 2013 06:34:05 +0000 (09:34 +0300)
committerEli Zaretskii <eliz@gnu.org>
Sat, 30 Mar 2013 06:34:05 +0000 (09:34 +0300)
1  2 
nt/inc/ms-w32.h

diff --cc nt/inc/ms-w32.h
Simple merge