merge from trunk
authorJosse Colpaert <jco@openerp.com>
Thu, 8 Nov 2012 14:16:22 +0000 (15:16 +0100)
committerJosse Colpaert <jco@openerp.com>
Thu, 8 Nov 2012 14:16:22 +0000 (15:16 +0100)
bzr revid: jco@openerp.com-20121108141622-ype8e0no6f7xxfh5


Trivial merge