[MERGE] login nivified
authorAntony Lesuisse <al@openerp.com>
Wed, 28 Sep 2011 09:41:22 +0000 (11:41 +0200)
committerAntony Lesuisse <al@openerp.com>
Wed, 28 Sep 2011 09:41:22 +0000 (11:41 +0200)
bzr revid: al@openerp.com-20110928094122-qvlqcxya0ba3u7p7


Trivial merge