x conflict unstable

[Jude DaShiell <jdashiel@shellworld.net>]

x11-common and xfree86-common are having a dpkg fight because both have 
/etc/X11/Xsession files in them.  I ran into this situation because one of 
the packages I have on this box and it's not the only one is astrolog from 
the non-free part of the repository.