Merge branch 'master' into maverick

- Removed epicsmotor from motor.c
- Fixed a bad define in tasscanub.h
Conflicts:
	makefile_macosx

motor.c

@@ -1066,19 +1066,6 @@ int MotorCreate(SConnection * pCon, SicsInterp * pSics, void *pData,
       SCWrite(pCon, pBueffel, eLogError);
       return 0;
     }
-    /*
-  } else if (strcmp(argv[2], "epics") == 0) {
-    if(argc > 3){
-      pDriver = epicsMakeMotorDriver(argv[3]);
-      if (!pDriver) {
-	return 0;
-      }
- 
-    } else {
-      SCWrite(pCon,"ERROR: missing basename argument to create EPICS motor",eError);
-      return 0;
-    }
-    */
   } else {
     site = getSite();
     if (site != NULL) {