As you could see in the CVS, I am in the progress of merging GLIB_oli and MAIN. Most files are done already and most test cases work (again). But still not all required files are commited.. and a lot of files need to be removed, as they are now in the real glib directory.