commit 75b0c0faa82a50d7a15a9ee7285d10b783243f76 Merge: fcdb0c8 ceb37d6 Author: Iain Arnell <iarnell at gmail.com> Date: Sun Jan 2 13:49:53 2011 +0100 initial psuedo merge for dist-git setup ---