[MERGE]
authorNajlaâ <nel@tinyerp.com>
Wed, 23 Nov 2011 10:09:09 +0000 (11:09 +0100)
committerNajlaâ <nel@tinyerp.com>
Wed, 23 Nov 2011 10:09:09 +0000 (11:09 +0100)
bzr revid: nel@tinyerp.com-20111123100909-1a3p6387ik5btne2


Trivial merge