16th git commit after keffufle with an earlier version of git
Merge branch 'master' of https://github.com/paradiseOffice/sandbox_and_programs

Merged after OpenSuse10.3 git problems.