[MERGE]
authoruco (Open ERP) <uco@tinyerp.com>
Wed, 22 Sep 2010 04:56:09 +0000 (10:26 +0530)
committeruco (Open ERP) <uco@tinyerp.com>
Wed, 22 Sep 2010 04:56:09 +0000 (10:26 +0530)
commit7f49c1f103527e44d666762ffc0e8e4acc433518
tree766c45e102a3e090dbcccf45697fd2b9c8d611bf
parentd34059a6222ba7d4ca687a56f90e7833eacfcbbd
parentc2fe1d1ab4bf060a7f48246551259d4dcca5db7a
[MERGE]

bzr revid: uco@tinyerp.com-20100922045609-uc324pcq2ohh0wqv