Index: source/blender/makesdna/DNA_userdef_types.h
===================================================================
--- source/blender/makesdna/DNA_userdef_types.h	(revision 11890)
+++ source/blender/makesdna/DNA_userdef_types.h	(working copy)
@@ -205,6 +205,7 @@
 #define USER_NONUMPAD			8192
 #define USER_LMOUSESELECT		16384
 #define USER_FILECOMPRESS		32768
+#define USER_TWEAKMODE			65536
 
 /* viewzom */
 #define USER_ZOOM_CONT			0
Index: source/blender/src/editobject.c
===================================================================
--- source/blender/src/editobject.c	(revision 11890)
+++ source/blender/src/editobject.c	(working copy)
@@ -3943,11 +3943,14 @@
 		getmouseco_areawin(mval);
 		if(abs(mval[0]-xo)+abs(mval[1]-yo) > 10) {
 			if(curarea->spacetype==SPACE_VIEW3D) {
-#ifdef TWEAK_MODE
-				initTransform(TFM_TRANSLATION, CTX_TWEAK);
-#else
-				initTransform(TFM_TRANSLATION, CTX_NONE);
-#endif
+				if(!(U.flag & USER_TWEAKMODE))
+				{
+					initTransform(TFM_TRANSLATION, CTX_TWEAK);
+				}
+				else
+				{
+					initTransform(TFM_TRANSLATION, CTX_NONE);
+				}
 				Transform();
 			}
 			else if(curarea->spacetype==SPACE_IMAGE) {
Index: source/blender/src/space.c
===================================================================
--- source/blender/src/space.c	(revision 11890)
+++ source/blender/src/space.c	(working copy)
@@ -3424,10 +3424,16 @@
 		if (U.flag & USER_LMOUSESELECT) 
 			U.flag &= ~USER_TWOBUTTONMOUSE;
 		
+		uiBlockBeginAlign(block);
 		uiDefButBitI(block, TOG, USER_TWOBUTTONMOUSE, B_DRAWINFO, "Emulate 3 Button Mouse",
 			(xpos+edgsp+(3*mpref)+(4*midsp)),y3,mpref,buth,
 			&(U.flag), 0, 0, 0, 0,
 			"Emulates Middle Mouse with Alt+LeftMouse (doesnt work with Left Mouse Select option)");
+
+		uiDefButBitI(block, TOGN, USER_TWEAKMODE, B_DRAWINFO, "Tweak Mode",
+			(xpos+edgsp+(3*mpref)+(4*midsp)),y2,mpref,buth,
+			&(U.flag), 0, 0, 0, 0, "Drag operations no longer require a click to complete (Best for tablet users)");
+		uiBlockEndAlign(block);
 		
 			
 		uiDefBut(block, LABEL,0,"Middle Mouse Button:",