Merge branch 'docs-security' into docs-move
authorRandy Dunlap <randy.dunlap@oracle.com>
Fri, 20 May 2011 16:10:04 +0000 (09:10 -0700)
committerRandy Dunlap <randy.dunlap@oracle.com>
Fri, 20 May 2011 16:10:04 +0000 (09:10 -0700)

Trivial merge