Merge remote-tracking branch 'origin/master' into debian
authorSam Hartman <hartmans@painless-security.com>
Mon, 29 Apr 2013 18:57:13 +0000 (14:57 -0400)
committerSam Hartman <hartmans@painless-security.com>
Mon, 29 Apr 2013 18:57:13 +0000 (14:57 -0400)

Trivial merge