Merge branch 'gemini_fix' of git://git.berlios.de/gemini-board into devel-stable