[MERGE]:with latest addons
authorKirti Savalia (OpenERP) <ksa@tinyerp.com>
Wed, 19 Oct 2011 12:21:34 +0000 (17:51 +0530)
committerKirti Savalia (OpenERP) <ksa@tinyerp.com>
Wed, 19 Oct 2011 12:21:34 +0000 (17:51 +0530)
bzr revid: ksa@tinyerp.com-20111019122134-kf36achn2dbinb7r


Trivial merge