merge from head branch to fix the operator dropdown box unable to clear issue.
Authored by: seanz 2011-08-24
Parent: [r5496]
Child: [r5498]