merge
authorFabien Pinckaers <fp@tinyerp.com>
Fri, 7 Aug 2009 13:55:21 +0000 (15:55 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Fri, 7 Aug 2009 13:55:21 +0000 (15:55 +0200)
commite0e362eb06b8943368f12b743b8c82259657c944
tree6449c8af866c134034411e7eeb0b766447956d4f
parentd60c59cdef90d0cb597f23069c25f9eeb4a3df86
parent387899e1a9f9a919b6dd8e04d7ba0b585fe02b69
merge

bzr revid: fp@tinyerp.com-20090807135521-xtjmrye29jvsbpae