Merge commit 'c1d75749e438628900ae880a3dafd96f4a97f15e' into HEAD
authorSam Hartman <hartmans@painless-security.com>
Tue, 9 Aug 2011 20:37:13 +0000 (16:37 -0400)
committerSam Hartman <hartmans@painless-security.com>
Tue, 9 Aug 2011 20:37:13 +0000 (16:37 -0400)

Trivial merge