[MERGE]Merge trunk upto revision 1531.
authorKunal Chavda (OpenERP) <kch@tinyerp.com>
Wed, 23 Nov 2011 05:15:03 +0000 (10:45 +0530)
committerKunal Chavda (OpenERP) <kch@tinyerp.com>
Wed, 23 Nov 2011 05:15:03 +0000 (10:45 +0530)
commitd24c964e42d5d7e62b809bba0c7d7e74b100309a
treeebb7a20266699ae1534b588869f84bb2f1928725
parent5372b9b9a16eb653622ffc347b6decbecb0a4e5e
parent5251a34a6235a2819a1aa8e0aca3d049bf6cbd0b
[MERGE]Merge trunk upto revision 1531.

bzr revid: kch@tinyerp.com-20111123051503-6lxe3pt4une7xrjz