[MERGE] Merged with latest trunk
authorAnand Patel (OpenERP) <pan@tinyerp.com>
Mon, 10 Dec 2012 08:41:22 +0000 (14:11 +0530)
committerAnand Patel (OpenERP) <pan@tinyerp.com>
Mon, 10 Dec 2012 08:41:22 +0000 (14:11 +0530)
bzr revid: pan@tinyerp.com-20121210084122-n7qyuh8hm6jvgmd9


Trivial merge