Fix #2368 (3-0-stable) #2381

Merged
merged 1 commit into from Jul 31, 2011
Commits on Jul 31, 2011