Merge branch 'master' into redhat
authorSam Hartman <hartmans@painless-security.com>
Mon, 29 Apr 2013 19:05:58 +0000 (15:05 -0400)
committerSam Hartman <hartmans@painless-security.com>
Mon, 29 Apr 2013 19:05:58 +0000 (15:05 -0400)

Trivial merge