Merge branch '3.2-maint'

* 3.2-maint:
  Update NEWS
  Fix --print-config to show pch_defines

diff --cc NEWS.txt
Simple merge

diff --cc conf.c
Simple merge

diff --cc test/test_conf.c
index 2bc9e40d97bfe88d2139ea2895dcc0289f4bbd18,780d64f41bd99db39853da8bfca8cc6bc12f028a..1a8749a59d181614817f8213e03754e486601022
--- 1/test/test_conf.c
--- 2/test/test_conf.c
+++ b/test/test_conf.c
@@@ -126,7 -116,7 +126,7 @@@ TEST(conf_read_valid_config
          "read_only_direct = true\n"
          "recache = true\n"
          "run_second_cpp = true\n"
-         "sloppiness =     file_macro   ,time_macros,  include_file_mtime,include_file_ctime,file_stat_matches,no_system_headers  pch_defines  \n"
 -        "sloppiness =     file_macro   ,time_macros,  include_file_mtime,include_file_ctime,file_stat_matches, pch_defines  \n"
++        "sloppiness =     file_macro   ,time_macros,  include_file_mtime,include_file_ctime,file_stat_matches,pch_defines ,  no_system_headers  \n"
          "stats = false\n"
          "temporary_dir = ${USER}_foo\n"
          "umask = 777\n"
@@@ -390,7 -369,7 +390,8 @@@ TEST(conf_print_items
                true,
                SLOPPY_FILE_MACRO|SLOPPY_INCLUDE_FILE_MTIME|
                SLOPPY_INCLUDE_FILE_CTIME|SLOPPY_TIME_MACROS|
-               SLOPPY_FILE_STAT_MATCHES|SLOPPY_NO_SYSTEM_HEADERS,
 -              SLOPPY_FILE_STAT_MATCHES|SLOPPY_PCH_DEFINES,
++              SLOPPY_FILE_STAT_MATCHES|SLOPPY_PCH_DEFINES|
++              SLOPPY_NO_SYSTEM_HEADERS,
                false,
                "td",
                022,
@@@ -437,8 -408,8 +438,8 @@@
        CHECK_STR_EQ("recache = true", received_conf_items[n++].descr);
        CHECK_STR_EQ("run_second_cpp = true", received_conf_items[n++].descr);
        CHECK_STR_EQ("sloppiness = file_macro, include_file_mtime,"
-                    " include_file_ctime, time_macros,"
+                    " include_file_ctime, time_macros, pch_defines,"
 -                   " file_stat_matches",
 +                   " file_stat_matches, no_system_headers",
                     received_conf_items[n++].descr);
        CHECK_STR_EQ("stats = false", received_conf_items[n++].descr);
        CHECK_STR_EQ("temporary_dir = td", received_conf_items[n++].descr);