Merge remote-tracking branch 'helterscelter/master'

Conflicts:
	pm-utils/40autorandr

diff --cc pm-utils/40autorandr
index fc97dea3875a1232e8fb5a3eaf23316a848f39c1,f465b06d4d4bdb6d8395bb6e79999bb49b2958a3..4ce7790255d1041db62637f495d1625912306441
--- 1/pm-utils/40autorandr
--- 2/pm-utils/40autorandr
+++ b/pm-utils/40autorandr
@@@ -1,9 -1,18 +1,18 @@@
  #!/bin/sh
  #
  # 40autorandr: Change autorandr profile on thaw/resume
 +exec > /var/log/autorandr.log 2>&1
  
- AUTORANDR="autorandr -c"
+ # detect if we are being called as 40auto-disper or 40autorandr
+ FORM=${0##*40}
+ case $FORM in
+       auto-disper)
+               AUTORANDR="auto-disper -c"
+               ;;
+       *)
+               AUTORANDR="autorandr -c"
+               ;;
+ esac
 -echo "$AUTORANDR"
  
  detect_display()
  {