Merge branch 'integration-1st-round' of https://www.ac.upc.edu/projects/iolanes/git/ubuntu-lucid into integration-1st-round