[MERGE]
authorStephane Wirtel <stephane@tinyerp.com>
Mon, 15 Dec 2008 12:38:46 +0000 (13:38 +0100)
committerStephane Wirtel <stephane@tinyerp.com>
Mon, 15 Dec 2008 12:38:46 +0000 (13:38 +0100)
bzr revid: stephane@tinyerp.com-20081215123846-zyc9o5c5q0ordq1h


Trivial merge