DeCosta - 2010-02-08

Perforce-generated patch file (p4 diff2 -u)