# HG changeset patch
# User Dario Sestito <darios@symbian.org>
# Date 1255452972 -3600
# Node ID 7a343c038e7d120d886ec1068c2c10b3c1165acd
# Parent  dd5f923b7f917beeb82cad75a152fa6af2768703# Parent  4a45293616f587f72126efb6d6b6b4250affd606
Merge

diff -r dd5f923b7f91 -r 7a343c038e7d common/tools/ats/bctest/locationsrv/locaqu/locaqu.pl
--- a/common/tools/ats/bctest/locationsrv/locaqu/locaqu.pl	Tue Oct 13 17:53:22 2009 +0100
+++ b/common/tools/ats/bctest/locationsrv/locaqu/locaqu.pl	Tue Oct 13 17:56:12 2009 +0100
@@ -12,7 +12,7 @@
 # Maciej Seroka <maciejs@symbian.org>
 #
 # Description:
-# Script to build ATS test drop Landmarks Application Editor BC tests
+# Script to build ATS test drop Location Acquisition BC tests
 
 
 use strict;
diff -r dd5f923b7f91 -r 7a343c038e7d common/tools/ats/bctest/locationsrv/locdbci/locdbci.pl
--- a/common/tools/ats/bctest/locationsrv/locdbci/locdbci.pl	Tue Oct 13 17:53:22 2009 +0100
+++ b/common/tools/ats/bctest/locationsrv/locdbci/locdbci.pl	Tue Oct 13 17:56:12 2009 +0100
@@ -12,7 +12,7 @@
 # Maciej Seroka <maciejs@symbian.org>
 #
 # Description:
-# Script to build ATS test drop Landmarks Application Editor BC tests
+# Script to build ATS test drop Landmarks Item Id Db Combi Info BC tests
 
 
 use strict;
diff -r dd5f923b7f91 -r 7a343c038e7d common/tools/ats/bctest/locationsrv/locsel/locsel.pl
--- a/common/tools/ats/bctest/locationsrv/locsel/locsel.pl	Tue Oct 13 17:53:22 2009 +0100
+++ b/common/tools/ats/bctest/locationsrv/locsel/locsel.pl	Tue Oct 13 17:56:12 2009 +0100
@@ -12,7 +12,7 @@
 # Maciej Seroka <maciejs@symbian.org>
 #
 # Description:
-# Script to build ATS test drop Landmarks Application Editor BC tests
+# Script to build ATS test drop Landmarks Selector BC tests
 
 
 use strict;
diff -r dd5f923b7f91 -r 7a343c038e7d common/tools/populateziptemplate.pl
--- a/common/tools/populateziptemplate.pl	Tue Oct 13 17:53:22 2009 +0100
+++ b/common/tools/populateziptemplate.pl	Tue Oct 13 17:56:12 2009 +0100
@@ -91,7 +91,7 @@
 			if ($layer eq "QEMU")
 			{
 				$packageName = $layer;
-				$layer = "os";
+				$layer = "adaptation";
 			}
 			else
 			{