[MERGE]
authornel@tinyerp.com <>
Mon, 29 Mar 2010 09:51:38 +0000 (11:51 +0200)
committernel@tinyerp.com <>
Mon, 29 Mar 2010 09:51:38 +0000 (11:51 +0200)
commit841360535361f85cd8cb2ba1d2d38595a4deb3c5
treeb3bbc400f6dfa358e87a3cd39924eddb67c3834a
parent40bb8599dd6cacb45599f3aa16edccc641a8d032
parentb2234d42dc3eb76b505f96f9e49ca0b5b4f69de3
[MERGE]

bzr revid: nel@tinyerp.com-20100329095138-wzwgli2t51rchom5