From f606012c87e21cd67653243a230ca610500141ef Mon Sep 17 00:00:00 2001
From: macdonst <simon.macdonald@gmail.com>
Date: Tue, 14 Sep 2010 14:43:46 -0400
Subject: [PATCH] Merge branches 'master' and 'contactSpec'