Merge commit 'refs/merge-requests/1' of ssh://gitorious.psi.ch/sinqdev/sics into merge-requests/1

First merge with ANSTO which compiles

Conflicts:
	SICSmain.c
	asynnet.c
	confvirtualmot.c
	counter.c
	devexec.c
	drive.c
	exebuf.c
	hipadaba.c
	interface.h
	make_gen
	motor.c
	nserver.c
	nwatch.c
	ofac.c
	protocol.c
	sicshipadaba.c

interface.h

@@ -109,6 +109,8 @@
                         void *pUserData, KillFuncIT pKill);
    int RemoveCallback(pICallBack pInterface, long iID);
    int RemoveCallback2(pICallBack pInterface, void *pUserData);
+   int RemoveCallbackUsr(pICallBack self, SICSCallBack pFunc, 
+		      int (*userfunc)(const void* pContext, const void* pUserData), void *pCtx);
    int RemoveCallbackCon(pICallBack pInterface, SConnection *pCon);
 
    int CallbackScript(SConnection *pCon, SicsInterp *pSics, void *pData,