[python-zope-testing/f13/master: 7/8] Merge commit 'da7a' into f13

[cheeselee]

commit a0a1b410eb15fad3b682f81730c52325cd7d8359
Merge: 939324e da7a983
Author: Robin Lee <robinlee.sysu at gmail.com>
Date:   Wed Sep 15 14:41:20 2010 +0800

    Merge commit 'da7a' into f13
    
    Conflicts:
    	.gitignore

 .gitignore               |    2 +-
 python-zope-testing.spec |   42 +++++++++++++++++++++++++++++++++++++-----
 sources                  |    2 +-
 3 files changed, 39 insertions(+), 7 deletions(-)
---