[MERGE]
authorNajlaâ <nel@tinyerp.com>
Thu, 8 Mar 2012 15:37:40 +0000 (16:37 +0100)
committerNajlaâ <nel@tinyerp.com>
Thu, 8 Mar 2012 15:37:40 +0000 (16:37 +0100)
bzr revid: nel@tinyerp.com-20120308153740-xijp04irh1iopvz0


Trivial merge