[MERGE]
authorNajlaâ <nel@tinyerp.com>
Wed, 8 Feb 2012 10:20:15 +0000 (11:20 +0100)
committerNajlaâ <nel@tinyerp.com>
Wed, 8 Feb 2012 10:20:15 +0000 (11:20 +0100)
bzr revid: nel@tinyerp.com-20120208102015-mazyri2jrpjk0g19


Trivial merge