commit 30003724883fa3fbe2933a8d4d5b6bd45fcabccb Merge: c3a5979 6481201 Author: Iain Arnell <iarnell at gmail.com> Date: Fri Feb 25 04:37:10 2011 +0100 Initial pseudo merge for dist-git setup ---