Merge branch 'fb-YAHOO-123-trunk-gd' into fb-YAHOO-234-trunk-gd