[MERGE]
authorChristophe Simonis <christophe@tinyerp.com>
Thu, 11 Dec 2008 13:53:14 +0000 (14:53 +0100)
committerChristophe Simonis <christophe@tinyerp.com>
Thu, 11 Dec 2008 13:53:14 +0000 (14:53 +0100)
commit3767640049d4e1e726ec59a19f940511d8a7c5b3
treee4f97942906534f648b55faed7f13b11b78b4179
parent080e0dc652d8e70d91dbb5fcc33d95b2899da251
parentcfc14c69aebfa5ae8cb0536712c4cf9168e43fe9
[MERGE]

bzr revid: christophe@tinyerp.com-20081211135314-we2wn2cexqsd3jw5