[MERGE] osv: automatically retry transactions that failed due to a transient concurre...

lp bug: https://launchpad.net/bugs/992525 fixed

bzr revid: odo@openerp.com-20130219161754-k18yrofkw0cvkoy3

diff --cc setup.py
index 75c7306,75c7306..7ef52a1
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -98,7 -98,7 +98,7 @@@ setuptools.setup
            'gdata',
            'lxml',
            'mako',
--          'psycopg2',
++          'psycopg2 >= 2.0.14',
            'pydot',
            'python-dateutil < 2',
            'python-ldap',