[cherry picking] manual merge of lp:~openerp-dev/openobject-addons/trunk-screenshots-main-modules-vba (part II)
bzr revid: chs@openerp.com-20130131184532-g8oqfm4m711bdhad
This commit is contained in:
bzr revid: chs@openerp.com-20130131184532-g8oqfm4m711bdhad