Merge build identification to default branch.

diff --cc Lib/platform.py
Simple merge

diff --cc Lib/test/test_platform.py
Simple merge

diff --cc Makefile.pre.in
Simple merge

diff --cc Python/sysmodule.c
Simple merge

diff --cc configure
index 5f2a58f0b730326c62a4607b37383f338432c928,98ae6e651dfdc46715acb76e7041d3b793e244bb..f87f7ef6cb5571368fccd86e3c613bb1eda6615f
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -1,7 -1,7 +1,7 @@@
  #! /bin/sh
- # From configure.in Revision: 88625 .
+ # From configure.in Revision.
  # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.65 for python 3.3.
 -# Generated by GNU Autoconf 2.68 for python 3.2.
++# Generated by GNU Autoconf 2.68 for python 3.3.
  #
  # Report bugs to <http://bugs.python.org/>.
  #
@@@ -1507,10 -1520,10 +1520,10 @@@ f
  test -n "$ac_init_help" && exit $ac_status
  if $ac_init_version; then
    cat <<\_ACEOF
 -python configure 3.2
 +python configure 3.3
- generated by GNU Autoconf 2.65
+ generated by GNU Autoconf 2.68
  
- Copyright (C) 2009 Free Software Foundation, Inc.
+ Copyright (C) 2010 Free Software Foundation, Inc.
  This configure script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it.
  _ACEOF
@@@ -2335,8 -2351,8 +2351,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 python $as_me 3.2, which was
 +It was created by python $as_me 3.3, which was
- generated by GNU Autoconf 2.65.  Invocation command line was
+ generated by GNU Autoconf 2.68.  Invocation command line was
  
    $ $0 $@
  
@@@ -7693,54 -7748,9 +7748,54 @@@ $as_echo "$SHLIBS" >&6; 
  
  
  # checks for libraries
- if test "${ac_cv_lib_sendfile_sendfile+set}" = set; then :
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sendfile in -lsendfile" >&5
 +$as_echo_n "checking for sendfile in -lsendfile... " >&6; }
- if test "x$ac_cv_lib_sendfile_sendfile" = x""yes; then :
++if ${ac_cv_lib_sendfile_sendfile+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  ac_check_lib_save_LIBS=$LIBS
 +LIBS="-lsendfile  $LIBS"
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
 +#ifdef __cplusplus
 +extern "C"
 +#endif
 +char sendfile ();
 +int
 +main ()
 +{
 +return sendfile ();
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +if ac_fn_c_try_link "$LINENO"; then :
 +  ac_cv_lib_sendfile_sendfile=yes
 +else
 +  ac_cv_lib_sendfile_sendfile=no
 +fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
 +LIBS=$ac_check_lib_save_LIBS
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sendfile_sendfile" >&5
 +$as_echo "$ac_cv_lib_sendfile_sendfile" >&6; }
++if test "x$ac_cv_lib_sendfile_sendfile" = xyes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_LIBSENDFILE 1
 +_ACEOF
 +
 +  LIBS="-lsendfile $LIBS"
 +
 +fi
 +
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
  $as_echo_n "checking for dlopen in -ldl... " >&6; }
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+ if ${ac_cv_lib_dl_dlopen+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@@ -14331,8 -14367,8 +14413,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 python $as_me 3.2, which was
 +This file was extended by python $as_me 3.3, which was
- generated by GNU Autoconf 2.65.  Invocation command line was
+ generated by GNU Autoconf 2.68.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
@@@ -14393,11 -14429,11 +14475,11 @@@ _ACEO
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
  ac_cs_version="\\
 -python config.status 3.2
 +python config.status 3.3
- configured by $0, generated by GNU Autoconf 2.65,
+ configured by $0, generated by GNU Autoconf 2.68,
    with options \\"\$ac_cs_config\\"
  
- Copyright (C) 2009 Free Software Foundation, Inc.
+ Copyright (C) 2010 Free Software Foundation, Inc.
  This config.status script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it."
  

diff --cc configure.in
Simple merge