trunk: Svnmerged [7445] from 0.11-stable (#1467 - `$USER` in custom queries).
Authored by: osimons 2008-08-06
Parent: [r7445]
Child: [r7447]