Merge : re-applies missing part of fix for Bug 2901,Add export for s60ibymacros.pm
Helium
Copyright (c) 2009 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"
which accompanies this distribution, and is available
at the URL "http://www.eclipse.org/legal/epl-v10.html".
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).