Merge commit 'origin/master'
root [Sun, 20 Mar 2011 23:49:49 +0000 (19:49 -0400)]

Trivial merge