[Merge] Merge from openerp-web.
authorJiten (OpenERP) <jra@tinyerp.com>
Fri, 14 Oct 2011 05:19:52 +0000 (10:49 +0530)
committerJiten (OpenERP) <jra@tinyerp.com>
Fri, 14 Oct 2011 05:19:52 +0000 (10:49 +0530)
commit4c15f26980f6ef312e00915c05411f8d326453ec
tree5384038796adcc6224a3cafc91dd71c381edfeb7
parent6592f2aeb3a8983093a3a77500c3c97cac5716b1
parent7b5b9d45ad26e47539504f19c00ad387569925e3
[Merge] Merge from openerp-web.

bzr revid: jra@tinyerp.com-20111014051952-a5emayrxco8oztyy