merge 3.2

This commit is contained in:
Matthias Klose 2012-03-14 23:17:31 +01:00
commit 5ce31cc4fc
7 changed files with 9 additions and 9 deletions

4
configure vendored
View file

@ -14599,8 +14599,8 @@ esac
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# Files that config.status was made for.
config_files="`echo $ac_config_files`"
config_headers="`echo $ac_config_headers`"
config_files="$ac_config_files"
config_headers="$ac_config_headers"
_ACEOF