[perl-MooseX-Getopt/el6/master: 8/8] Merge remote branch 'origin/master' into el6

[Iain Arnell]

commit 10664be510c155259bd26ad95a55dd03a9b610ba
Merge: 2684891 5f60d8b
Author: Iain Arnell <iarnell at gmail.com>
Date:   Sat Jan 8 12:51:35 2011 +0100

    Merge remote branch 'origin/master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore              |    3 ++-
 auto.ini                |    2 ++
 perl-MooseX-Getopt.spec |   22 +++++++++++++++++-----
 sources                 |    2 +-
 4 files changed, 22 insertions(+), 7 deletions(-)
---