Merge branch 'csshooks'
authorJohn Resig <jeresig@gmail.com>
Fri, 17 Sep 2010 18:32:43 +0000 (14:32 -0400)
committerJohn Resig <jeresig@gmail.com>
Fri, 17 Sep 2010 18:32:43 +0000 (14:32 -0400)

Trivial merge