[MERGE]: Merge with lp:openobject-addons
authorAtik Agewan (OpenERP) <aag@tinyerp.com>
Wed, 12 Oct 2011 07:23:11 +0000 (12:53 +0530)
committerAtik Agewan (OpenERP) <aag@tinyerp.com>
Wed, 12 Oct 2011 07:23:11 +0000 (12:53 +0530)
commiteb9d5c204f0877451b4c9e71fac96b6ee1752577
treed216e23686d8551b72e72fd6a56b3832668715d8
parentb84df3fa886f72fd7ce515ffd5eeedd4c7b5d055
parent048cfa7804759c6b3fb952983451165fb319bc80
[MERGE]: Merge with lp:openobject-addons

bzr revid: aag@tinyerp.com-20111012072311-h2gjdbci7s946757