Merge remote branch 'origin/master'
Jesse Luehrs [Mon, 3 Jan 2011 23:32:39 +0000 (17:32 -0600)]

Trivial merge