commit c39fea422bb10b8954df52004020713484aa6482 Merge: ee606c5 af5e80d 577a99a ee606c5 4589fd2 Author: Iain Arnell <iarnell at gmail.com> Date: Fri Aug 27 17:24:45 2010 +0200 initial pseudo-merge for dist-git setup ---