Merge branch 'develop' of ssh://gitorious.psi.ch/sinqdev/sics into develop

Conflicts:
	fourmess.c

test/testini.tcl

@@ -500,12 +500,12 @@ proc schneggestatus {} {
 	    if {$runtime > $starttime} {
 		sct writestatus evalcheck
 	    }
-	    return busy
+	    return run
 	}
 	evalcheck {
 	    set tst [hval /sics/farm/schneggerunning]
 	    if {$tst == 1} {
-		return busy
+		return run
 	    } else {
 		return idle
 	    }