--- a/sbsv2/raptor/lib/flm/e32abiv2.flm	Tue Apr 13 13:30:12 2010 +0100
+++ b/sbsv2/raptor/lib/flm/e32abiv2.flm	Tue Apr 13 17:35:43 2010 +0100
@@ -48,7 +48,7 @@
 
 ifeq ($(DOBUILD),1)
 
-$(if $(FLMDEBUG),$(info <flm name='e32abiv2' target='$(TARGET)' type='$(TARGETTYPE)' outputpath='$(OUTPUTPATH)' metasource='$(METASOURCE)' postlinkfiletype='$(POSTLINKFILETYPE)' />))
+$(if $(FLMDEBUG),$(info <debug><flm name='e32abiv2' target='$(TARGET)' type='$(TARGETTYPE)' outputpath='$(OUTPUTPATH)' metasource='$(METASOURCE)' postlinkfiletype='$(POSTLINKFILETYPE)' /></debug>))
 
 # Strip switch-type parameters
 #

--- a/sbsv2/raptor/lib/flm/resource.flm	Tue Apr 13 13:30:12 2010 +0100
+++ b/sbsv2/raptor/lib/flm/resource.flm	Tue Apr 13 17:35:43 2010 +0100
@@ -229,8 +229,8 @@
         ifeq ($(TARGET_$(call sanitise,$1)),)
                 TARGET_$(call sanitise,$1):=1
 
-            $(if $(FLMDEBUG),$(info generateresource: $(1) from $(2) LANG:$(3)),)	
-            $(if $(FLMDEBUG),$(info generateresource: copies: $(sort $(patsubst %,%/$(notdir $(1)),$(RSCCOPYDIRS)))))
+            $(if $(FLMDEBUG),$(info <debug>generateresource: $(1) from $(2) LANG:$(3)</debug>),)	
+            $(if $(FLMDEBUG),$(info <debug>generateresource: copies: $(sort $(patsubst %,%/$(notdir $(1)),$(RSCCOPYDIRS)))</debug>))
 
             CLEANTARGETS:=$$(CLEANTARGETS) $(1)
 

--- a/sbsv2/raptor/test/smoke_suite/test_resources/resource/group/testresource.mmp	Tue Apr 13 13:30:12 2010 +0100
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/resource/group/testresource.mmp	Tue Apr 13 17:35:43 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of the License "Eclipse Public License v1.0"