[MERGE] merge with trunk
authorKhushboo Bhatt (Open ERP) <kbh@tinyerp.com>
Wed, 26 Sep 2012 04:58:43 +0000 (10:28 +0530)
committerKhushboo Bhatt (Open ERP) <kbh@tinyerp.com>
Wed, 26 Sep 2012 04:58:43 +0000 (10:28 +0530)
commit20c19c5f0f48271e16bb769ccddb50197ced7697
tree0db46ae8b2f896edb5fba3b44a25d127a5a9c7b4
parent5f9f5c5f49ced085613664940e3536d3d08ff17f
parentdb42aeb57642f363c71bcf7cffe929c27ccb1df9
[MERGE] merge with trunk

bzr revid: kbh@tinyerp.com-20120926045843-bqqhoajejxxefvk2