Merge commit 'origin/master'
root [Tue, 22 Mar 2011 12:24:50 +0000 (08:24 -0400)]

Trivial merge