Resolve conflicts between Justin Bogner's C.Desktop patch and latest head.
Resolve conflicts between Justin Bogner's C.Desktop patch and latest head.

Ignore-this: ba805e9889d6bda5ea873e3537b0111f

darcs-hash:20091022115849-7f603-c645c8a5aa256445d6caaa8c4bc308f885ee5fe5

yzhou61/xmonad-contrib,yzhou61/xmonad-contrib,yzhou61/xmonad-contrib