[python-zope-testing/f14/master: 2/2] Merge branch 'master' into f14

[cheeselee]

commit e0ec2fb1d08e5bacff3e5b186b3dce282bbe1ff1
Merge: d98fafd e1e5386
Author: Robin Lee <robinlee.sysu at gmail.com>
Date:   Tue Aug 31 10:45:25 2010 +0800

    Merge branch 'master' into f14

 python-zope-testing.spec |   22 +++++++++-------------
 1 files changed, 9 insertions(+), 13 deletions(-)
---