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

[cheeselee]

commit 538e276bd1612e833e9548c2c152403b7cbb8dac
Merge: 8e9513f 3410c5f
Author: Robin Lee <robinlee.sysu at gmail.com>
Date:   Sun Sep 19 10:47:44 2010 +0800

    Merge branch 'master' into f13

 python-zope-interface.spec |   28 ++++++++++++++++++++++++----
 1 files changed, 24 insertions(+), 4 deletions(-)
---