[MERGE]
authorNajlaâ <nel@tinyerp.com>
Wed, 18 Jan 2012 15:52:47 +0000 (16:52 +0100)
committerNajlaâ <nel@tinyerp.com>
Wed, 18 Jan 2012 15:52:47 +0000 (16:52 +0100)
bzr revid: nel@tinyerp.com-20120118155247-j8cevhn1hlpq78jq


Trivial merge