merge
authorFabien Pinckaers <fp@tinyerp.com>
Tue, 16 Feb 2010 06:49:44 +0000 (07:49 +0100)
committerFabien Pinckaers <fp@tinyerp.com>
Tue, 16 Feb 2010 06:49:44 +0000 (07:49 +0100)
bzr revid: fp@tinyerp.com-20100216064944-s7z3vifgho5cnail


Trivial merge