Merge.
--- a/homescreenpluginsrv/hspsresult/src/hspspluginidlist.cpp Sun Mar 28 16:37:14 2010 +0100
+++ b/homescreenpluginsrv/hspsresult/src/hspspluginidlist.cpp Tue Mar 30 12:59:56 2010 +0100
@@ -30,7 +30,7 @@
// might leave.
// -----------------------------------------------------------------------------
//
-EXPORT_C ChspsPluginIdList::ChspsPluginIdList( TInt aGranularity ) : CArrayFixFlat( aGranularity )
+EXPORT_C ChspsPluginIdList::ChspsPluginIdList( TInt aGranularity ) : CArrayFixFlat<TInt>( aGranularity )
{
}