Merge branch '6897' of http://github.com/SlexAxton/jquery into SlexAxton-6897
authorJohn Resig <jeresig@gmail.com>
Mon, 25 Oct 2010 20:06:23 +0000 (13:06 -0700)
committerJohn Resig <jeresig@gmail.com>
Mon, 25 Oct 2010 20:06:23 +0000 (13:06 -0700)

Trivial merge