From: scottjehl <scott@scottjehl.com>
Date: Wed, 19 Jan 2011 17:32:57 +0000 (-0500)
Subject: Merge remote branch 'upstream/master'
X-Git-Tag: 1.5rc1~19^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=cb1f7eeac5073748ae6200f2f960fb330ec966a8;p=jquery.git

Merge remote branch 'upstream/master'
---

cb1f7eeac5073748ae6200f2f960fb330ec966a8