merge
authorFabien Pinckaers <fp@tinyerp.com>
Tue, 16 Feb 2010 11:29:09 +0000 (12:29 +0100)
committerFabien Pinckaers <fp@tinyerp.com>
Tue, 16 Feb 2010 11:29:09 +0000 (12:29 +0100)
commitde870f4335171065247d53ec83b679e5ba09d370
tree5444fee48e3fcbd62cdba039a3c821a631c97f94
parentd9023437e09582109ad041f1ea29b67e01c0c66d
parent9ffaeb7efe392c0a95aa2cdfff24ed2d2e4408dc
merge

bzr revid: fp@tinyerp.com-20100216112909-56iv6g3p244u4pxv