From 2f9c47e0d51ce1d3c33285654c36dfa1522728c7 Mon Sep 17 00:00:00 2001
From: Stefan van der Walt <stefan@sun.ac.za>
Date: Thu, 12 Nov 2009 10:58:53 +0200
Subject: [PATCH] Merge remote branches 'colbert/master' and
 'colbert/luttables' into chris_merge