[MERGE]merge with parent branch
authorSanjay Gohel (Open ERP) <sgo@tinyerp.com>
Fri, 8 Jun 2012 13:34:23 +0000 (19:04 +0530)
committerSanjay Gohel (Open ERP) <sgo@tinyerp.com>
Fri, 8 Jun 2012 13:34:23 +0000 (19:04 +0530)
bzr revid: sgo@tinyerp.com-20120608133423-rv33zgeckkm4fvt0


Trivial merge