Merge commit 'origin/master'
root [Tue, 15 Mar 2011 16:29:12 +0000 (12:29 -0400)]

Trivial merge