[MERGE]
authorChristophe Simonis <christophe@tinyerp.com>
Mon, 26 Jan 2009 15:55:16 +0000 (16:55 +0100)
committerChristophe Simonis <christophe@tinyerp.com>
Mon, 26 Jan 2009 15:55:16 +0000 (16:55 +0100)
commite4cc55534bc4885202d14f2e7dc7494b58935ed2
tree4bce9a45cfd8aa988acd4e68a7351a15f03a3221
parentab41714295af23aa5c95790777fbe2e65dff8efa
parentfc63af9856f83b9194eaee415c7202bf54836629
[MERGE]

bzr revid: christophe@tinyerp.com-20090126155516-bp5prx6uuzteqk5g