[MERGE]
authorStephane Wirtel <stephane@tinyerp.com>
Thu, 18 Dec 2008 16:08:03 +0000 (17:08 +0100)
committerStephane Wirtel <stephane@tinyerp.com>
Thu, 18 Dec 2008 16:08:03 +0000 (17:08 +0100)
commit8cbc528334cb3762ed6bfa94639ae6c1ebb8e73d
tree4e9399774172d33d9a6cad5311123cdd15e00023
parent643d5f87bd28e1d67c9fa1643cb5c45aa9d04195
parentef3beeae56603bcbd064f7091a2bd87834c0355f
[MERGE]

bzr revid: stephane@tinyerp.com-20081218160803-an0ui7pu97py3hiw