I used to have the caps lock and control swapped in GNOME, but when I upgraded to Ubuntu 9.04 I also changed my desktop environment to Xfce. I have the following line in my xorg.conf:
Option "XkbOptions" "ctrl:nocaps"
But that doesn't seem to make a difference to Xfce. Any ideas?