[rubygem-snmp/el5: 11/11] Merge branch 'master' into el5

[Michael Stahnke]

commit 8e11a5cd66d585473eaad8c643c89e413f135b58
Merge: 242f377 840bc33
Author: Michael Stahnke <stahnma at puppetlabs.com>
Date:   Sun Jan 8 09:12:17 2012 -0600

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	rubygem-snmp.spec
    	sources

 .gitignore        |    2 ++
 rakefile.patch    |   38 ++++++++++++++++++++++++++++++++++++++
 rubygem-snmp.spec |   47 ++++++++++++++++++++++++++++++++---------------
 sources           |    2 +-
 4 files changed, 73 insertions(+), 16 deletions(-)
---