[perl-IO-AIO: 6/9] Merge branch 'master' into el6

[Paul Howarth]

commit 4c69abb9ab1a53084f0871efaed00c5ae34159aa
Merge: 54a3245 1861811
Author: Paul Howarth <paul at city-fan.org>
Date:   Thu Mar 10 14:19:54 2011 +0000

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore       |    2 +-
 perl-IO-AIO.spec |   60 +++++++++++++++++++++++++++++++++++++++--------------
 sources          |    2 +-
 3 files changed, 46 insertions(+), 18 deletions(-)
---
diff --cc .gitignore
index 76e860d,95965d3..f945f0b
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
- IO-AIO-3.17.tar.gz
 -IO-AIO-3.65.tar.gz
 -/IO-AIO-3.71.tar.gz
++/IO-AIO-3.17.tar.gz