[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)
commit3cc28dce76a1667ff9e547e3bb79784a8cdd07a9
treebc4993962194234b988e1d796d662cd99f8ea004
parentf3b67f4f7129876ef5f90e6879391c7542d3185a
parent4c15f26980f6ef312e00915c05411f8d326453ec
[merge] synch with the mobile client branch

bzr revid: nicolas.vanhoren@openerp.com-20111017122326-t7t6g90g6gfiph0q