Merged en el trunk:
revno: 491 [merge] revision-id: javier@squezee-vir-20111221211401-vhoq0kvuc67u1ees
Merged en el trunk:
revno: 491 [merge] squezee- vir-20111221211 401-vhoq0kvuc67 u1ees
revision-id: javier@