merge 3.3 and 3.2 changes related to 10836

This commit is contained in:
Senthil Kumaran 2012-10-27 02:51:12 -07:00
commit 5979fdf548

Diff Content Not Available