commit 2653e0409b53d9856b79a3ddedc5b2a6838447e5 Merge: 97ab63a 8b4bd3f Author: Iain Arnell <iarnell at gmail.com> Date: Fri Jan 7 05:11:12 2011 +0100 psuedo merge for dist-git setup ---