This needs to go into Horde_Core
Too wordy
Horde_Queue is mandatory, since Horde_Queue_Storage is a global injector instance
Fix property name
Merge branch 'master' into imp_6_1

Conflicts:
	imp/search.php