[MERGE]
authorChristophe Simonis <chs@tinyerp.com>
Sun, 13 Sep 2009 21:37:30 +0000 (23:37 +0200)
committerChristophe Simonis <chs@tinyerp.com>
Sun, 13 Sep 2009 21:37:30 +0000 (23:37 +0200)
bzr revid: chs@tinyerp.com-20090913213730-myosgkcltrmb66rq


Trivial merge