From 1b3e7e503122cbb0bf67d0461597f4ef87579ee7 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Sat, 6 Dec 2008 19:33:00 +0000
Subject: [PATCH] Continue tidyling up

bzr-revno: 193