Merge branch 'master' into divVerent/crypto2

Conflicts:
	all

diff --cc all
index 12d312afbc8ffca5b09203bc66687b9f1da4335a,282a69033a903d5c1672866fbb02b1c6bd489149..38c19007c51d70c5ae19bebae1a3c1d2fe77087e
--- 1/all
--- 2/all
+++ b/all
@@@ -521,11 -573,32 +574,34 @@@ case "$cmd" i
                done
                ;;
        compile)
++              cleand0=false
+               cleandp=false
+               cleanqcc=false
+               cleanqc=false
+               debug=debug
+               while :; do
+                       case "$1" in
+                               -c)
++                                      cleand0=true
+                                       cleandp=true
+                                       cleanqcc=true
+                                       cleanqc=true
+                                       shift
+                                       ;;
+                               -r)
+                                       debug=release
+                                       shift
+                                       ;;
+                               *)
+                                       break
+                                       ;;
+                       esac
+               done
                if [ -z "$CC" ]; then
-                       export CC="gcc -DSUPPORT_IPV6"
+                       export CC="gcc -DSUPPORTIPV6"
                fi
                if [ -n "$WE_HATE_OUR_USERS" ]; then
-                       TARGETS="sv-debug cl-debug"
+                       TARGETS="sv-$debug cl-$debug"
                elif [ x"`uname`" = x"Darwin" ]; then
                        case "`uname -r`" in
                                ?.*)