commit c608dffad07dd9303d9b9f1ad2696ce0d7c2af90 Merge: 856863e 37ef5f9 445c3d8 856863e Author: Iain Arnell <iarnell at gmail.com> Date: Sun Aug 29 10:59:18 2010 +0200 initial pseudo-merge for dist-git setup ---