[MERGE]
authorNajlaâ <nel@tinyerp.com>
Thu, 15 Dec 2011 14:19:22 +0000 (15:19 +0100)
committerNajlaâ <nel@tinyerp.com>
Thu, 15 Dec 2011 14:19:22 +0000 (15:19 +0100)
bzr revid: nel@tinyerp.com-20111215141922-2hh0x3mebg554nw7


Trivial merge