[MERGE]
authorNajlaâ <nel@tinyerp.com>
Thu, 8 Mar 2012 13:19:20 +0000 (14:19 +0100)
committerNajlaâ <nel@tinyerp.com>
Thu, 8 Mar 2012 13:19:20 +0000 (14:19 +0100)
bzr revid: nel@tinyerp.com-20120308131920-fz8fiv7irad06nvo


Trivial merge