[rubygem-snmp/el6: 6/6] Merge branch 'master' into el6

[Michael Stahnke]

commit 7534c7da43c2338bc5165a9dbb7bfc8236657f0a
Merge: 3c6db79 8156902
Author: Michael Stahnke <stahnma at puppetlabs.com>
Date:   Sat Jan 7 20:11:09 2012 -0600

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

 .gitignore        |    2 ++
 rakefile.patch    |   38 ++++++++++++++++++++++++++++++++++++++
 rubygem-snmp.spec |   31 +++++++++++++++++++------------
 sources           |    2 +-
 4 files changed, 60 insertions(+), 13 deletions(-)
---