merge
authorFabien Pinckaers <fp@tinyerp.com>
Thu, 18 Jun 2009 20:33:11 +0000 (22:33 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Thu, 18 Jun 2009 20:33:11 +0000 (22:33 +0200)
commit51dd8dff0e3ecd8e806b519dcf3c681886a36e81
tree83d354de35b23545b6ddcc6cdbf8ca529a776bd6
parent185df210a8b697da0087657ac23485d4dbe55cbd
parent12434e7292d8c861581f3a8a206201afa32e21fa
merge

bzr revid: fp@tinyerp.com-20090618203311-4srit4hhu3h9hk8p