some fixes so 'python setup.py bdist_rpm' works
Merge branch 'master' of https://github.com/osynge/odpgen into osynge-master

Conflicts:
	setup.py
Merge branch 'osynge-master'

Some fixes so 'python setup.py bdist_rpm' works