merge
authorFabien Pinckaers <fp@tinyerp.com>
Wed, 17 Sep 2008 12:06:24 +0000 (14:06 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Wed, 17 Sep 2008 12:06:24 +0000 (14:06 +0200)
commitfca6850f173894e7936dd2fe590a448d5ffc2918
treef45b936ba984c55f8c9d10a2bfc25bd6e45b1cb9
parent0b0c2cde32e64339cea837da2948be04cc283663
parentbd17a1e2b00ce451beba2bd1d39d83090e318feb
merge

bzr revid: fp@tinyerp.com-20080917120624-6j4t1obvmvmm3l2e