[MERGE] Merge with lp:openobject-addons
authorSbh (OpenERP) <sbh@tinyerp.com>
Wed, 15 Dec 2010 05:47:06 +0000 (11:17 +0530)
committerSbh (OpenERP) <sbh@tinyerp.com>
Wed, 15 Dec 2010 05:47:06 +0000 (11:17 +0530)
bzr revid: sbh@tinyerp.com-20101215054706-mgwy0cxf5tct6qz5


Trivial merge