[IMP]merge branch
authorPinakin Nayi (OpenERP) <pna@tinyerp.com>
Mon, 24 Sep 2012 08:23:00 +0000 (13:53 +0530)
committerPinakin Nayi (OpenERP) <pna@tinyerp.com>
Mon, 24 Sep 2012 08:23:00 +0000 (13:53 +0530)
bzr revid: pna@tinyerp.com-20120924082300-9unb65nu3asph4x6


Trivial merge