Merge commit 'origin/master'
root [Mon, 21 Mar 2011 22:15:16 +0000 (18:15 -0400)]

Trivial merge