removed excludes (they are all moved to fb-YAHOO-318-trunk-gd)
Merge remote branch 'origin/branch-0.23-gd' into fb-YAHOO-260-branch-0.23-gd