commit 01ce435da993c7e95e2b73f0f5c959aa9b70ead7 Merge: 70903ae 1be8eaf 07c067b 70903ae 1be8eaf Author: Iain Arnell <iarnell at gmail.com> Date: Tue Aug 31 05:42:56 2010 +0200 initial pseudo-merge for dist-git setup ---