Conflicts: sources/qpme.qpe.core/META-INF/MANIFEST.MF sources/qpme.simqpn.kernel/META-INF/MANIFEST.MF