keypad.el wierdness in CVS emacs?

[Robert Mecklenburg]

I'm running a recent cvs emacs and the keypad keys act strangely when
shifted:

C-h c                 ;; describe key
<S-kp-7>              ;; shifted kp-7
7 (translated from <S-kp-7>) runs the command self-insert-command

Shifted keypad 7 (and other keypad keys) yields ascii 7 instead 
of the S-kp-7 I would expect.  I discovered in the NEWS a new package
keypad.el that seems to have some effect on this and reset the
customized variables:

 '(keypad-numlock-shifted-setup (quote none) nil (keypad))
 '(keypad-shifted-setup (quote none) nil (keypad))

But this seems to have no effect.  How can I get my keypad keys back?

Thanks,
Robert