Fixes User/CustomValue association broken by r2869 (#3978).
Authored by: jplang 2009-10-10
Parent: [r2904]
Child: [r2906]