[MERGE]
authorStephane Wirtel <stephane@tinyerp.com>
Mon, 29 Dec 2008 10:30:39 +0000 (11:30 +0100)
committerStephane Wirtel <stephane@tinyerp.com>
Mon, 29 Dec 2008 10:30:39 +0000 (11:30 +0100)
commita0d306a4ef601f454255824d96dee347988a7353
tree8ecfaa02450ccfd29855a214d3e43e946b803be0
parent99c6070e3f2b10ab90e7142c739cf6b56f2edc91
parentb86bfc4e61923526fd02c8ab80cf3224055155a4
[MERGE]

bzr revid: stephane@tinyerp.com-20081229103039-fcp7fo3pokv5z7ac