# HG changeset patch
# User Sebastien Decugis <sdecugis@nict.go.jp>
# Date 1237916332 -32400
# Node ID d07dd60aefb0ffe540fb4db0ae2c772356e37668
# Parent  24952be71de91f6522d24e2eecf28303edf0d5cb# Parent  1a7c79257a305599eaab4aa1823c66ce90d97c9d
merge

diff -r 24952be71de9 -r d07dd60aefb0 IETF74-ERP.odp
Binary file IETF74-ERP.odp has changed