Merge branch 'master' into polkit-integration-branch
    
    Conflicts:
    
    	ChangeLog
    	configure.ac
    	doc/oddjob.html
    	oddjob.spec
    	src/mainloop.c
    	src/oddjob_dbus.c
    	src/oddjob_request.c
    	src/oddjobd.c
    	src/pam_oddjob_mkhomedir.c
    	src/pam_oddjob_mounthomedir.c