[python-iptools/el6: 2/2] Merge branch 'master' into el6

[Orion Poplawski]

commit ed0a1af387e63b34ab84023d58824b6e4ee53839
Merge: ccfa08f 2a97d11
Author: Orion Poplawski <orion at nwra.com>
Date:   Tue Apr 23 09:18:47 2013 -0600

    Merge branch 'master' into el6

 python-iptools.spec |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
---