commit 02501ddf3dc848a4877a988f3bb90c13fd520fa9 Merge: ed661fc c801b19 Author: Iain Arnell <iarnell at gmail.com> Date: Thu Jan 6 16:48:24 2011 +0100 initial psuedo merge for dist-git setup ---