commit 9150c61bace48dced22fe686a65180da540b4d19 Merge: 24bb578 13d6e39 0a85c42 24bb578 dc63310 Author: Iain Arnell <iarnell at gmail.com> Date: Sun Aug 29 10:40:16 2010 +0200 initial pseudo-merge for dist-git setup ---