merge 3.3

Modules/unicodedata.c

@@ -1325,7 +1325,7 @@ this database is based on the UnicodeData.txt file version\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,