[MERGE]
authorolt <olt@tinyerp.com>
Tue, 11 Aug 2009 12:47:42 +0000 (08:47 -0400)
committerolt <olt@tinyerp.com>
Tue, 11 Aug 2009 12:47:42 +0000 (08:47 -0400)
commita14e372744e771a7c5ebc6a2a04e32308838e105
treeac1e75d87a50836832e4c685479be7a88ed26f52
parent7e1a6139e3c8bb1450711e22d3c107b210590776
parent500cfa0463cfabb19f73589c1a35e1ce96aac313
[MERGE]

bzr revid: olt@tinyerp.com-20090811124742-xnpw5vzyszz1omc2