Merge branch 'fix-7398-frameset-docs' of https://github.com/dmethvin/jquery into...
authorjeresig <jeresig@gmail.com>
Fri, 21 Jan 2011 16:22:55 +0000 (11:22 -0500)
committerjeresig <jeresig@gmail.com>
Fri, 21 Jan 2011 16:22:55 +0000 (11:22 -0500)

Trivial merge