[perl-SNMP-Info/el6: 9/9] Merge branch 'master' into el6

[gouldwp]

commit 5e6763028bccc807ab224ec496d26eeb8fe9034d
Merge: 19abeef faf17c6
Author: Walter Gould <gouldwp at fedoraproject.org>
Date:   Sat Oct 15 15:32:22 2011 -0500

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 perl-SNMP-Info.spec |   12 ++++++------
 sources             |    2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)
---