Merge branch 'f13' into el5
    
    Rebase to 0.9.6. Merging from f13 rather than master, to keep
    using fedora-usermgmt.
    The SELinux changes were not tested on el5, but the package
    never built the policy package in el5 anyway.
    
    Conflicts:
    	icecream.spec
    	icecream.te
    	sources