Fixes #3962.  Proxy commit for haysmark. ComboBox instantiates its query object.
Fixes #3962.  Proxy commit for haysmark.
ComboBox instantiates its query object.

git-svn-id: 674a2d6b1e32e53f607eb824547723f32280967e@9938 560b804f-0ae3-0310-86f3-f6aa0a117693

redaktor/deliteful