Fixed layout problem.
Fixed typo.
Merge branch 'release' into python2.3