[Merge] Merged branch for the fix of lp:732613
[Merge] Merged branch for the fix of lp:732613
gisce/openobject-server,splbio/openobject-server,vnc-biz/openerp-server,ovnicraft/openerp-server,gisce/openobject-server,splbio/openobject-server,MarkusTeufelberger/openobject-server,ovnicraft/openerp-server,gisce/openobject-server,vnc-biz/openerp-server,MarkusTeufelberger/openobject-server,splbio/openobject-server,MarkusTeufelberger/openobject-server