wifi network password is asked after resume, even if it is in the keyring

After resume, network-manager tries to reconnect to my wireless access point. This often works, but lately I am having problems more often. One of them is that it tries to reconnect to the correct wireless network, but asks for the password. It is in gnome-keyring, however, and when I cancel the dialog and select my access point manually, it connects ok (without asking for a password).

$ uname -a
Linux danny 2.6.22-14-generic #1 SMP Sun Oct 14 21:45:15 GMT 2007 x86_64 GNU/Linux
$ sudo lspci -vs 06:00.0
06:00.0 Network controller: Intel Corporation PRO/Wireless 3945ABG Network Connection (rev 02)
        Subsystem: Intel Corporation Unknown device 1051
        Flags: bus master, fast devsel, latency 0, IRQ 18
        Memory at cc000000 (32-bit, non-prefetchable) [size=4K]
        Capabilities: [c8] Power Management version 2
        Capabilities: [d0] Message Signalled Interrupts: Mask- 64bit+ Queue=0/0 Enable-
        Capabilities: [e0] Express Legacy Endpoint IRQ 0
$ dmesg | grep ipw
[ 4.528395] ipw3945: Intel(R) PRO/Wireless 3945 Network Connection driver for Linux, 1.2.2mp.ubuntu1
[ 4.528405] ipw3945: Copyright(c) 2003-2006 Intel Corporation
[ 4.529889] ipw3945: Detected Intel PRO/Wireless 3945ABG Network Connection
[ 7.008433] ipw3945: Detected geography ABG (13 802.11bg channels, 23 802.11a channels)