Merge branch 'master' into f16
    
    * Thu Sep  1 2011 David Malcolm <dmalcolm@redhat.com> - 3.2.1-2.2
    - disable parts of test_io on ppc (rhbz#732998)
    - use "--findleaks --verbose" when running test suite
    - re-enable and fix the --with-tsc option on ppc64, and rework it on 32-bit
    ppc to avoid aliasing violations (patch 130; rhbz#698726)
    - add %%python3_version to the rpm macros (rhbz#719082)
    
    Conflicts:
    	python3.spec