commit d8001fa4f3674381e89cd8d1cae31c5e2a1ec42e Merge: b25cd0a 6a49aad 3d85146 c81cdd4 6a49aad Author: Iain Arnell <iarnell at gmail.com> Date: Sat Aug 28 13:11:41 2010 +0200 initial pseudo-merge for dist-git setup ---