Merge branch 'master' of /home/dvk/infomed/cl-gtk2