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

[cheeselee]

commit d98fafdbc60fdb068d434bd01edcc7608a572a41
Merge: bd9177b 771922e
Author: Robin Lee <robinlee.sysu at gmail.com>
Date:   Mon Aug 30 13:03:44 2010 +0800

    Merge branch 'master' into f14

 .gitignore               |    1 +
 python-zope-testing.spec |   21 +++++++--------------
 sources                  |    2 +-
 3 files changed, 9 insertions(+), 15 deletions(-)
---