[MERGE] Merge with lp:openobject-addons
authorSbh (OpenERP) <sbh@tinyerp.com>
Wed, 19 Jan 2011 05:10:49 +0000 (10:40 +0530)
committerSbh (OpenERP) <sbh@tinyerp.com>
Wed, 19 Jan 2011 05:10:49 +0000 (10:40 +0530)
commit8a91d2ca02df0e0705a3f78a1bf5b1459d6af3f9
tree45640512de5727808cdc962c9438f4474f0499a6
parent4de0ca454d6341e49700b795a873ee79cafb4ffd
parent8274154d42c8f904cffb7acf7ea124b94b26f254
[MERGE] Merge with lp:openobject-addons

bzr revid: sbh@tinyerp.com-20110119051049-wkdffl0su0fqtvdh