[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)
commit84d57a468c5ff37ca478d76efb322547ccb50325
treee6b0549b15c0a196f0ff83cbd9f44c2cb1ef3db0
parent7b6622a2ebff7e1ace500e88d8a63592f2c0ea95
parentb21c41276485ae7689c29821a6c069cbabb784cd
[MERGE] with rvalyi's work

bzr revid: alexis@via.ecp.fr-20120127154105-93r6blsn2xsd17nu