From: scottjehl <scott@scottjehl.com>
Date: Wed, 19 Jan 2011 17:32:57 +0000 (-0500)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: http://git.asbjorn.biz/?a=commitdiff_plain;h=cb1f7eeac5073748ae6200f2f960fb330ec966a8;hp=--cc;p=jquery.git

Merge remote branch 'upstream/master'
---

cb1f7eeac5073748ae6200f2f960fb330ec966a8