merge
authorFabien Pinckaers <fp@tinyerp.com>
Wed, 28 Jan 2009 15:14:46 +0000 (16:14 +0100)
committerFabien Pinckaers <fp@tinyerp.com>
Wed, 28 Jan 2009 15:14:46 +0000 (16:14 +0100)
commit3a7c9de403f3bc46502e4b028017a03d8bb276a1
treefd9f7c990f2717041a3b0d64686ebaa480e98fd4
parenta7fa06f7cd0c7a33001f28126f4d80e362b668e9
parent645eb15ebf8620f0871cb0c15b1a16e187b0d9fc
merge

bzr revid: fp@tinyerp.com-20090128151446-15grcltzq5wk06o7