[perl-IO-Multiplex/f13/master: 8/8] Merge branch 'master' into f13

[Paul Howarth]

commit 5ddec6e5207a131ca6db3a411e293e20c491bfbf
Merge: 7e34c2b 033acd7
Author: Paul Howarth <paul at city-fan.org>
Date:   Mon Feb 21 15:53:57 2011 +0000

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore

 .gitignore             |    2 +-
 perl-IO-Multiplex.spec |   51 +++++++++++++++++++++++++++++++++--------------
 sources                |    2 +-
 3 files changed, 38 insertions(+), 17 deletions(-)
---