Merge branch 'master' of /home/manom/cousas/informatica/codigo/scm/foo/