[MERGE]
authornel@tinyerp.com <>
Tue, 15 Jun 2010 13:45:44 +0000 (15:45 +0200)
committernel@tinyerp.com <>
Tue, 15 Jun 2010 13:45:44 +0000 (15:45 +0200)
commit706e4c24b008e98e9f8ac866bfb54d2cb6dc34f4
tree7acccdd84c24e8dd01cd85cbe007536aa2fe1848
parentb54be75ee88af1406d71a6eeae82055270ff971a
parent06dd77aa000e17224f686ce61b4ca142bad1e102
[MERGE]

bzr revid: nel@tinyerp.com-20100615134544-thgi9u33ow2gx8og