[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)
bzr revid: olt@tinyerp.com-20090811124742-xnpw5vzyszz1omc2


Trivial merge