commit 534988b9686694c1fa2730ea8fbec9a042bcb7fb Merge: da39fe0 b0b4f67 2077aa7 da39fe0 b0b4f67 Author: Iain Arnell <iarnell at gmail.com> Date: Sat Aug 28 08:13:05 2010 +0200 initial pseudo-merge for dist-git setup ---