From 6d7e3e8b04b63d92c61d1109c35163690f2c9948 Mon Sep 17 00:00:00 2001
From: waspe <waspe>
Date: Mon, 03 Nov 2003 17:55:02 +0000
Subject: reolved merge conflict

---
(limited to 'core/opie-login/loginwindowimpl.cpp')

--
cgit v0.9.0.2