[MERGE]:trunk
authorAmit Patel <apa@tinyerp.com>
Thu, 1 Nov 2012 05:53:21 +0000 (11:23 +0530)
committerAmit Patel <apa@tinyerp.com>
Thu, 1 Nov 2012 05:53:21 +0000 (11:23 +0530)
commit6200ba6f2c80215f1c05c9167e380387dd0a5f1a
treec89f6277fe378b737c455a8003b1729e057cc1a9
parent9a82511a45f968614983fe693673d62bc46a9d42
parentb006809773df62a31663df260400c766b666c32a
[MERGE]:trunk

bzr revid: apa@tinyerp.com-20121101055321-hkxi2edwp8wgwdt7