Unida a la rama principal:
revno: 39 [merge] revision-id: javier@squezee-vir-20120126213827-7hxpi0aeci0c0ini
Unida a la rama principal:
revno: 39 [merge] squezee- vir-20120126213 827-7hxpi0aeci0 c0ini
revision-id: javier@