[MERGE] with rvalyi's work
authorAlexis de Lattre <alexis@via.ecp.fr>
Fri, 27 Jan 2012 15:41:05 +0000 (16:41 +0100)
committerAlexis de Lattre <alexis@via.ecp.fr>
Fri, 27 Jan 2012 15:41:05 +0000 (16:41 +0100)
bzr revid: alexis@via.ecp.fr-20120127154105-93r6blsn2xsd17nu


Trivial merge