[MERGE] Merge from main addons
authorMustufa Rangwala (OpenERP) <mra@tinyerp.com>
Tue, 17 Jul 2012 09:36:58 +0000 (15:06 +0530)
committerMustufa Rangwala (OpenERP) <mra@tinyerp.com>
Tue, 17 Jul 2012 09:36:58 +0000 (15:06 +0530)
bzr revid: mra@tinyerp.com-20120717093658-2hwcew0ipjzu5spo


Trivial merge