[python-zope-interface/f13/master: 6/6] Merge branch 'master' into f13

[cheeselee]

commit 8e9513f232ddc8b566c73f034a67c7eb60d57ec2
Merge: f878814 a81774c
Author: Robin Lee <robinlee.sysu at gmail.com>
Date:   Wed Sep 15 11:29:43 2010 +0800

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore

 .gitignore                 |    2 +-
 ZPL-2.1.txt                |   40 ------------------------------
 python-zope-interface.spec |   57 +++++++++++++++++++++++--------------------
 sources                    |    2 +-
 4 files changed, 32 insertions(+), 69 deletions(-)
---