[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)
bzr revid: kch@tinyerp.com-20111123051503-6lxe3pt4une7xrjz


Trivial merge