[MERGE]
authoruco (OpenERP) <uco@tinyerp.com>
Wed, 19 May 2010 05:10:58 +0000 (10:40 +0530)
committeruco (OpenERP) <uco@tinyerp.com>
Wed, 19 May 2010 05:10:58 +0000 (10:40 +0530)
commit5ecb42ccd8654193dd6779a52f03658e8dc8af88
tree7fcce6261b242a85a633b70c04fcf97157119390
parent6ec34eceb486c8427aeb0fb03d9aba0138dbe070
parent67133e1dc40682ec11cf387c4ae576ee6d0752f7
[MERGE]

bzr revid: uco@tinyerp.com-20100519051058-a5hfrptrt5q2i37u