Merge branch 'master' of openobject-server into mdv-gpl3-py26

Conflicts:

	bin/tools/translate.py

bzr revid: p_christ@hol.gr-20090128135050-bb1ueo5ovziijg00

1 files changed, 3 insertions, 0 deletions

diff --git a/setup.py b/setup.py
index 73d37cdf43f..4c8b09ce003 100755
--- a/setup.py
+++ b/setup.py
@@ -44,6 +44,9 @@ opj = os.path.join
 
 execfile(opj('bin', 'release.py'))
 
+if sys.argv[1] != 'bdist_rpm':
+    version = version + '-' + release
+
 # get python short version
 py_short_version = '%s.%s' % sys.version_info[:2]