[merge] synch with the mobile client branch
authorniv-openerp <nicolas.vanhoren@openerp.com>
Mon, 17 Oct 2011 12:23:26 +0000 (14:23 +0200)
committerniv-openerp <nicolas.vanhoren@openerp.com>
Mon, 17 Oct 2011 12:23:26 +0000 (14:23 +0200)
bzr revid: nicolas.vanhoren@openerp.com-20111017122326-t7t6g90g6gfiph0q


Trivial merge