[MERGE]:merged from lp:openobject-addons
authorapa-tiny <apa@tinyerp.com>
Tue, 12 Oct 2010 05:50:02 +0000 (11:20 +0530)
committerapa-tiny <apa@tinyerp.com>
Tue, 12 Oct 2010 05:50:02 +0000 (11:20 +0530)
commitdf8e2eae6e337f708cdbdfaf2eafe2ceac696e70
treeae4772551b0cbd26e12f93aba4f729fd1af5855b
parent46c20afd4fdbd88d39aa59a4a5d60922accfdc8d
parent16293307bb550edae82282a4e7afc62075942fc9
[MERGE]:merged from lp:openobject-addons

bzr revid: apa@tinyerp.com-20101012055002-bpczo0a32nzm9m8v