diff -r 1c8fca9ff3fb -r 27d9d356efbf symbian3/mw/imghandling/package_definition_3.0.xml
--- a/symbian3/mw/imghandling/package_definition_3.0.xml	Thu Mar 11 10:32:52 2010 +0000
+++ b/symbian3/mw/imghandling/package_definition_3.0.xml	Wed Mar 17 14:41:09 2010 +0000
@@ -1,27 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
-  <package id="imghandling" name="Image Handling" levels="lib util if">
-    <collection id="imagehandlinglib" name="Image Handling Library" level="lib">
-    	<!-- collection is really a component, need to move down a directory -->
-      <component id="ihl" filter="s60" name="IHL">
-        <unit bldFile="imagehandlinglib/group"/>
-      </component>
-	    <component id="imagehandlinglib_api" filter="s60,test,api_test" name="Image Handling Library API Test" purpose="development">
-	     	<unit bldFile="imagehandlinglib/tsrc/public/basic/group"/>
-		</component>
-    </collection>
-    <collection id="imagehandlingutilities" name="Image Handling Utilities" level="util">
-      <component id="thumbnailmanager" filter="s60" name="Thumbnail Manager">
-        <unit bldFile="imagehandlingutilities/thumbnailmanager/group"/>
-      </component>
-    </collection>
-    <collection id="imghandling_info" name="Image Handling Info" level="if">
-      <component id="imagehandling_plat" filter="s60" name="Image Handling Platform Interfaces" class="api">
-        <unit bldFile="imagehandling_plat/group"/>
-      </component>
-      <component id="imagehandling_api_test" filter="s60,test,api_test" name="Image Handling Platform API Test" purpose="development">
-        <unit bldFile="imagehandling_plat/thumbnailmanager_api/tsrc/group"/>
-      </component>
-    </collection>
-  </package>
+ <package id="imghandling" name="Image Handling" levels="lib util if">
+  <collection id="imagehandling_plat" name="Image Handling Platform Interfaces" level="if">
+   <component id="image_handling_library_api" name="Image Handling Library API" class="api" filter="s60">
+    <meta rel="Api" href="imagehandling_plat/image_handling_library_api/image_handling_library_api.metaxml"/>
+    <unit bldFile="imagehandling_plat/image_handling_library_api/group"/>
+   </component>
+   <component id="3gp_library_api" name="3GP Library API" class="api" filter="s60">
+    <meta rel="Api" href="imagehandling_plat/3gp_library_api/3gp_library_api.metaxml"/>
+    <unit bldFile="imagehandling_plat/3gp_library_api/group"/>
+   </component>
+   <component id="thumbnailmanager_api" name="Thumbnail Manager API" class="api" filter="s60">
+    <meta rel="Api" href="imagehandling_plat/thumbnailmanager_api/thumbnailmanager_api.metaxml"/>
+    <unit bldFile="imagehandling_plat/thumbnailmanager_api/group" filter="!test"/>
+    <unit bldFile="imagehandling_plat/thumbnailmanager_api/tsrc/group" filter="test,api_test"/>
+   </component>
+  </collection>
+  <collection id="imagehandlinglib" name="Image Handling Library" level="lib">
+   <!-- collection is really a component, need to move down a directory -->
+   <component id="ihl" filter="s60" name="IHL">
+    <unit bldFile="imagehandlinglib/group"/>
+   </component>
+   <component id="imagehandlinglib_api" filter="s60,test,api_test" name="Image Handling Library API Test" purpose="development">
+    <unit bldFile="imagehandlinglib/tsrc/public/basic/group"/>
+   </component>
+  </collection>
+  <collection id="imagehandlingutilities" name="Image Handling Utilities" level="util">
+   <component id="thumbnailmanager" filter="s60" name="Thumbnail Manager">
+    <unit bldFile="imagehandlingutilities/thumbnailmanager/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>