Merge commit 'origin/master'
root [Wed, 6 Apr 2011 20:20:26 +0000 (16:20 -0400)]

Trivial merge