[MERGE]
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Thu, 28 Jun 2012 10:29:25 +0000 (15:59 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Thu, 28 Jun 2012 10:29:25 +0000 (15:59 +0530)
commit9bbcf9cfe65e1a5a71e2b606458ff094732055b5
treed933dccd07afe63723c14160fcddd25a63d3df15
parentf895582bb177e7e74c30c89ad149cf1005f11f9e
parent38072b256c5aecf62ac523a255856b3adc460e8a
[MERGE]

bzr revid: apa@tinyerp.com-20120628102925-17wg14ro1ie16gvx