# HG changeset patch
# User Eugene Ostroukhov <eugeneo@symbian.org>
# Date 1271725474 25200
# Node ID eef7c6acd0f394a186ca8c3d73eb9f864443148d
# Parent  e9484be98cfea815261e64284288824d4e3a60f5# Parent  528ed2ad874b04d95b41cd43a5e5e5403e04c331
Heads merge

diff -r e9484be98cfe -r eef7c6acd0f3 org.symbian.tools.wrttools.previewer/preview/script/nokia.js
--- a/org.symbian.tools.wrttools.previewer/preview/script/nokia.js	Mon Apr 19 18:03:51 2010 -0700
+++ b/org.symbian.tools.wrttools.previewer/preview/script/nokia.js	Mon Apr 19 18:04:34 2010 -0700
@@ -853,6 +853,7 @@
 			}
 			values = values.replace(/<dict.*?(<key.*?>\s*.*\s*<\/string>)\s*<\/dict>/, "{ $1 }");
 			values = values.replace(/\s*<key.*?>\s*(.*?)\s*<\/key>\s*<string.*?>\s*(.*?)\s*<\/string>\s*/g, "\"$1\" : \"$2\", ");
+			values = values.replace(/"\s*?,\s*?}/g, "\" }");
 			try {
 				NOKIA.emulator.plist = JSON.parse(values);
 			} catch (exception) {
diff -r e9484be98cfe -r eef7c6acd0f3 org.symbian.tools.wrttools/projecttemplates/flickr.zip
Binary file org.symbian.tools.wrttools/projecttemplates/flickr.zip has changed