[MERGE] Merge with lp:openobject-addons
authorHiral Patel (OpenERP) <hip@tinyerp.com>
Wed, 7 Nov 2012 04:51:40 +0000 (10:21 +0530)
committerHiral Patel (OpenERP) <hip@tinyerp.com>
Wed, 7 Nov 2012 04:51:40 +0000 (10:21 +0530)
bzr revid: hip@tinyerp.com-20121107045140-kblre1ef728rqhp0


Trivial merge