[MERGE]
authorNajlaâ <nel@tinyerp.com>
Tue, 31 Jan 2012 12:45:11 +0000 (13:45 +0100)
committerNajlaâ <nel@tinyerp.com>
Tue, 31 Jan 2012 12:45:11 +0000 (13:45 +0100)
bzr revid: nel@tinyerp.com-20120131124511-5ev3y9lx56ld8499


Trivial merge