From a61de589d09fb7fb5b72fe7867e7493b40d2e226 Mon Sep 17 00:00:00 2001
From: briancaruso <briancaruso@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Fri, 5 Aug 2011 14:19:44 +0000
Subject: [PATCH] Attemping to commit merge properties