Windowmanager for gnome/sid

[Ruben van Royen <rvroyen@guidedbees.com>]

Hi, 

I recently upgraded my workstation to sid. But now for some reason the
windowmanager has changed to the x-window-manager (wmaker in my case).
I tried changeing /etc/gnome/default.wm to gnome-wm, setting 
WINDOW_MANAGER to /usr/bin/sawfish in my .zshenv, changeing 
.gnome/default.wm to /usr/bin/sawfish and removing all my .gnome files
and directories. 
The strange thing is that the startup screen of gnome says starting 
gnome window manager, and then later it says starting sawfish, which 
never happens since wmaker is already started.
Does anybody know what config file is broken?

Greets, 

Ruben