Merge branch 'master' into ubuntu
Conflicts: trunk/debian/changelog (resuelto)
Authored by: Joaquin Bogado 2010-06-04
Parents: [1d8561][5ccc87]