# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

git-svn-id: http://afi-forge.afi-sa.fr/svn/opacce/trunk@2482 e3cc70dd-a52f-4065-8a26-0e09943c8c5c