merge from trunk
authorNumerigraphe - Lionel Sausin <ls@numerigraphe.fr>
Thu, 5 Feb 2009 17:56:16 +0000 (18:56 +0100)
committerNumerigraphe - Lionel Sausin <ls@numerigraphe.fr>
Thu, 5 Feb 2009 17:56:16 +0000 (18:56 +0100)
commiteee44f919af747f661eacd4e3bcbb8ceb12b8406
treeb1f057b9ef865b45363d2cf9ef9895eb9fab2acd
parentef1e57f3c88510d85072116d78954b9c62348b84
parent9b4d0613a68024fe9474f2e0e613f957a54be21b
merge from trunk

bzr revid: ls@numerigraphe.fr-20090205175616-sw42e2tk7xeyzjqi