[MERGE]: Merge with lp:openobject-addons
authorAtik Agewan (OpenERP) <aag@tinyerp.com>
Wed, 19 Oct 2011 06:45:19 +0000 (12:15 +0530)
committerAtik Agewan (OpenERP) <aag@tinyerp.com>
Wed, 19 Oct 2011 06:45:19 +0000 (12:15 +0530)
bzr revid: aag@tinyerp.com-20111019064519-5k063twt3ledcfr9


Trivial merge