From 504d9a97def87f4eff15307a272795e70c2a915a Mon Sep 17 00:00:00 2001
From: An-Cheng Huang <ancheng@vyatta.com>
Date: Tue, 1 Feb 2011 16:57:52 -0800
Subject: exclude change from merge

---
 .merge-branch-exclude | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.merge-branch-exclude b/.merge-branch-exclude
index 461c816..ec99e10 100644
--- a/.merge-branch-exclude
+++ b/.merge-branch-exclude
@@ -1,4 +1,4 @@
 6521907e2deb6b13a9048334d70657a2c4f12b73
 fdcf5294b4a60c2a1a75e40442cb09b58e470885
 4935b31eb6b6c755f7ce3e0102a60996c1b1d633
-
+0e51f32d8fa8a8cff5d844e3c6802e1d4372cee8
-- 
cgit v1.2.3