# HG changeset patch
# User Brendan Donegan brendand@symbian.org
# Date 1248270930 -3600
# Node ID 48a6e55f691be9c239724e73642699bb0ceee36f
# Parent  cdf0b7c501d2e7e9d5a4779a472f9b23b5dff177# Parent  cf05cf95f5d35b7127d5718f27febda5ca81a62f
Merge to tip

diff -r cf05cf95f5d3 -r 48a6e55f691b common/tools/ats/STAF/STAF_security.txt
--- a/common/tools/ats/STAF/STAF_security.txt	Wed Jul 22 12:07:18 2009 +0100
+++ b/common/tools/ats/STAF/STAF_security.txt	Wed Jul 22 14:55:30 2009 +0100
@@ -2,4 +2,5 @@
 TRUST LEVEL 5 MACHINE sym-build02.*
 TRUST LEVEL 5 MACHINE lon-engbuild87.*
 TRUST LEVEL 5 MACHINE lon-engbuild89.*
+TRUST LEVEL 5 MACHINE uk-brendand.*
 
diff -r cf05cf95f5d3 -r 48a6e55f691b common/tools/ats/devices/sym-build02/EMULATOR_GENERIC_SYMBUILD02.properties
--- a/common/tools/ats/devices/sym-build02/EMULATOR_GENERIC_SYMBUILD02.properties	Wed Jul 22 12:07:18 2009 +0100
+++ b/common/tools/ats/devices/sym-build02/EMULATOR_GENERIC_SYMBUILD02.properties	Wed Jul 22 14:55:30 2009 +0100
@@ -7,7 +7,7 @@
 
 CONNECTION=emulator
 
-TEMPDIR=C:\\ATS3
+TEMPDIR=D:\\ATS3
 
 CLASS=GenericTestableDevice