[pysnmp/el6: 4/4] Merge branch 'master' into el6

[Fabian Affolter]

commit 6c662e53f3983e1ac68c3ad44263f9cd23723004
Merge: 73a6d67 677dbd7
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Sat Oct 19 08:39:17 2013 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	pysnmp.spec

 pysnmp.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---