From caaa60c824bedd1ac40831a1135f104d7c8a1255 Mon Sep 17 00:00:00 2001
From: jrm424 <jrm424@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 2 Sep 2010 20:37:30 +0000
Subject: [PATCH] corrected and re-organised to prevent loss or duplication of
 properties