Update bzr_merge_addons-vauxoo_trunk_70
Merge pull request #2 from JulioSerna/patch-1

Update bzr_merge_addons-vauxoo_trunk_70