[MERGE]
authorNajlaâ <nel@tinyerp.com>
Tue, 10 Jan 2012 13:33:37 +0000 (14:33 +0100)
committerNajlaâ <nel@tinyerp.com>
Tue, 10 Jan 2012 13:33:37 +0000 (14:33 +0100)
bzr revid: nel@tinyerp.com-20120110133337-ku1ebqyzysez9jts


Trivial merge