[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
authormtr <mtr@mtr>
Tue, 1 Feb 2011 09:01:29 +0000 (14:31 +0530)
committermtr <mtr@mtr>
Tue, 1 Feb 2011 09:01:29 +0000 (14:31 +0530)
commit5b30009372f1375cd3922c55edadf26718fb192b
treeed63dca98e95ade4767222b0e6779f496044b04f
parent6847838d4b9bc1505a2f894bf7934437eac1ce33
parente3f85ce570c43df3146b940abc1f209b63c0ee66
[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3

bzr revid: mtr@mtr-20110201090129-elm8ppherqte6fc4