From ffb95d2dc9d419b26a5d0ebaa44f3eda74589f1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Charette?= <stephanecharette@gmail.com>
Date: Mon, 23 Feb 2009 01:38:09 +0000
Subject: [PATCH] checking in svn property changes that are brought forward
 every time I run 'svn merge' command

svn: r12086