merge 3.3

diff --cc Modules/unicodedata.c
index 59bfb343578aed59a3d7267c4a2260d5a42fc51d,901e337952e40aab6c6c1b5341bcdf858d27aba9..b96e96b50a1d1d87d4993ec40a6112f4bba6cdd3
--- 1/Modules/unicodedata.c
--- 2/Modules/unicodedata.c
+++ b/Modules/unicodedata.c
@@@ -1322,11 -1322,12 +1322,11 @@@ PyDoc_STRVAR(unicodedata_docstring
  "This module provides access to the Unicode Character Database which\n\
  defines character properties for all Unicode characters. The data in\n\
  this database is based on the UnicodeData.txt file version\n\
 -6.0.0 which is publically available from ftp://ftp.unicode.org/.\n\
 +6.3.0 which is publically available from ftp://ftp.unicode.org/.\n\
  \n\
  The module uses the same names and symbols as defined by the\n\
- UnicodeData File Format 6.3.0");
+ UnicodeData File Format " UNIDATA_VERSION ".");
  
 -
  static struct PyModuleDef unicodedatamodule = {
          PyModuleDef_HEAD_INIT,
          "unicodedata",