From b8ec048fb27bfbfb1660a9ccf74e4e985653ede1 Mon Sep 17 00:00:00 2001
From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Mon, 10 Jan 2011 07:59:41 +0000
Subject: [PATCH] More breakage from a855e38 - this is what you get for having
 everything in one giant function