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)
bzr revid: ls@numerigraphe.fr-20090205175616-sw42e2tk7xeyzjqi


Trivial merge