3 Commits

Author	SHA1	Message	Date
Guido van Rossum	f10aa9825e	Another merge. Only doc stuff was affected (but this aligns the UTF-32 ... codec changes in trubk and branch). Hopefully the Py3k glossary wasn't different from the trunk one.	2007-08-17 18:30:38 +00:00
Guido van Rossum	da27fd2673	Manually patched a few things that didn't get merged in, but should.	2007-08-17 00:24:54 +00:00
Georg Brandl	116aa62bf5	Move the 3k reST doc tree in place.	2007-08-15 14:28:22 +00:00