merge
authorFabien Pinckaers <fp@tinyerp.com>
Wed, 31 Mar 2010 14:49:35 +0000 (16:49 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Wed, 31 Mar 2010 14:49:35 +0000 (16:49 +0200)
commit0df4600ac1379eaf37c2d7066e7c4f38947616bd
tree482a810292d7ea611b8916f79796bf866d1fc126
parent036dfd209ee714f2ca0e6c4cd0cc122556e2dbca
parentfbeab98cf1604d164e6b11030829f25bf381627e
merge

bzr revid: fp@tinyerp.com-20100331144935-qqzvrmolejwcv6hl