[MERGE] Merged from the main server trunk branch
authorAnup (OpenERP) <ach@tinyerp.com>
Tue, 18 May 2010 08:45:44 +0000 (14:15 +0530)
committerAnup (OpenERP) <ach@tinyerp.com>
Tue, 18 May 2010 08:45:44 +0000 (14:15 +0530)
commitbb92ae9dee689e198c6a5368bb75ddcc30ec3a98
tree850fdaee0e8eb19962807baf3adaf22e4eaf6b6c
parent5a6390f71d43088faf9d5b38bcb37e103e40df24
parentc146c020be4a8cf32942ebc708c00f3e9e50eacd
[MERGE] Merged from the main server trunk branch

bzr revid: ach@tinyerp.com-20100518084544-5gwifbob3c0rlfmf