[MERGE]with lp:~openerp-dev/openobject-addons/trunk-dev-addons1
authorjam-openerp <jam@tinyerp.com>
Mon, 17 Jan 2011 05:17:54 +0000 (10:47 +0530)
committerjam-openerp <jam@tinyerp.com>
Mon, 17 Jan 2011 05:17:54 +0000 (10:47 +0530)
commitc901b03b43d3ec29f3ccc9841e4169dd1430138b
tree9cb35e55cc8f28b4a998e07191cf61a72e866a3f
parent55c01f72c973731e187ab65a68dfc1231c8e0bc6
parentdd9965cf7caa1af06399b3bd803aa35af03cd44a
[MERGE]with lp:~openerp-dev/openobject-addons/trunk-dev-addons1

bzr revid: jam@tinyerp.com-20110117051754-ad7v5pq93destj7j