[MERGE] with lp:~openerp-dev/openobject-addons/trunk-dev-addons1
authorjam-openerp <jam@tinyerp.com>
Mon, 13 Dec 2010 07:03:28 +0000 (12:33 +0530)
committerjam-openerp <jam@tinyerp.com>
Mon, 13 Dec 2010 07:03:28 +0000 (12:33 +0530)
commitb9cb6b2d15df85c48a27c6740c0ee3195a15210d
tree6602eeabce9730b10dfb2f331b06deaf1a517c49
parenta01c3728c51caded70cc4980e8d3113ff2de11bb
parente1ec2e8ebb1f4f6a5ebbdf79f56e5737192fab6e
[MERGE] with lp:~openerp-dev/openobject-addons/trunk-dev-addons1

bzr revid: jam@tinyerp.com-20101213070328-uhf1tzsxzc3nldhz