Merge branch 'redhat'
authorSam Hartman <hartmans@painless-security.com>
Fri, 10 May 2013 10:10:28 +0000 (06:10 -0400)
committerSam Hartman <hartmans@painless-security.com>
Fri, 10 May 2013 10:10:28 +0000 (06:10 -0400)

Trivial merge